commit e365099: Merge pull request #8 from rspamd/master
GitHub
noreply at github.com
Thu Dec 27 18:28:12 UTC 2018
Author: heraklit256
Date: 2018-12-19 19:26:34 +0000
URL: https://github.com/rspamd/rspamd/commit/e36509986bcc059a99ca5c08d9a7d90c1f1217f5
Merge pull request #8 from rspamd/master
merge upstream into local master
.circleci/config.yml | 41 +-
.drone.yml | 140 +-
.eslintrc.json | 2 +-
.gitignore | 2 +
.luacheckrc | 1 +
.tidyallrc | 25 +
AUTHORS.md | 4 +-
CMakeLists.txt | 8 +-
ChangeLog | 131 ++
centos/rspamd.spec | 1 +
clang-plugin/CMakeLists.txt | 44 +-
clang-plugin/FindLLVM.cmake | 366 +++--
clang-plugin/printf_check.cc | 17 +-
conf/composites.conf | 21 +-
conf/logging.inc | 5 +-
conf/mime_types.inc | 1 +
conf/modules.d/clickhouse.conf | 8 -
conf/modules.d/ratelimit.conf | 29 +-
conf/modules.d/rbl.conf | 20 +-
conf/modules.d/rspamd_update.conf | 1 +
conf/options.inc | 6 +
conf/scores.d/rbl_group.conf | 26 +
conf/statistic.conf | 32 +-
conf/worker-normal.inc | 1 -
contrib/aho-corasick/_acism.h | 73 +-
contrib/aho-corasick/acism.h | 4 +-
contrib/aho-corasick/acism_create.c | 113 +-
contrib/librdns/rdns.h | 2 +-
contrib/librdns/resolver.c | 4 +-
contrib/libucl/ucl_parser.c | 36 +-
contrib/libucl/ucl_util.c | 92 +-
doc/Makefile | 12 +-
doc/doxydown/doxydown.pl | 23 +-
interface/css/bootstrap.min.css | 7 +-
interface/css/rspamd.css | 117 +-
interface/index.html | 8 +-
interface/js/app/history.js | 57 +-
interface/js/app/upload.js | 2 +-
interface/js/lib/bootstrap.min.js | 8 +-
.../lua/antivirus.lua => lualib/lua_antivirus.lua | 563 ++++---
lualib/lua_auth_results.lua | 105 +-
lualib/lua_clickhouse.lua | 25 +-
lualib/lua_fuzzy.lua | 321 ++++
lualib/lua_meta.lua | 2 +-
lualib/lua_redis.lua | 268 ++-
lualib/lua_selectors.lua | 111 +-
lualib/lua_squeeze_rules.lua | 43 +-
lualib/lua_stat.lua | 357 +++-
lualib/lua_util.lua | 107 +-
lualib/rspamadm/configwizard.lua | 11 +-
lualib/rspamadm/cookie.lua | 121 ++
lualib/rspamadm/mime.lua | 366 ++++-
package.json | 5 +-
rules/regexp/headers.lua | 2 +-
rules/regexp/misc.lua | 22 +
src/CMakeLists.txt | 15 +-
src/client/rspamc.c | 11 +-
src/client/rspamdclient.c | 2 +-
src/controller.c | 137 +-
src/fuzzy_storage.c | 282 +++-
src/libcryptobox/base64/ref.c | 2 +-
src/libcryptobox/blake2/blake2.h | 14 +-
src/libcryptobox/chacha20/chacha.h | 5 +-
src/libcryptobox/poly1305/ref-64.c | 5 +-
src/libmime/archives.c | 38 +-
src/libmime/content_type.c | 74 +-
src/libmime/content_type.h | 17 +-
src/libmime/email_addr.c | 31 +-
src/libmime/email_addr.h | 13 +
src/libmime/filter.c | 22 +-
src/libmime/filter.h | 6 +-
src/libmime/images.c | 7 +-
src/libmime/lang_detection.c | 210 ++-
src/libmime/lang_detection.h | 21 +-
src/libmime/message.c | 262 +--
src/libmime/message.h | 18 +-
src/libmime/mime_encoding.c | 212 +--
src/libmime/mime_encoding.h | 7 +-
src/libmime/mime_expressions.c | 284 +++-
src/libmime/mime_headers.c | 49 +-
src/libmime/mime_headers.h | 2 +-
src/libmime/mime_parser.c | 100 +-
src/libserver/CMakeLists.txt | 2 +-
src/libserver/cfg_file.h | 10 +-
src/libserver/cfg_rcl.c | 119 +-
src/libserver/cfg_utils.c | 53 +-
src/libserver/composites.c | 2 +-
src/libserver/dkim.c | 93 +-
src/libserver/dkim.h | 37 +-
src/libserver/dns.c | 55 +-
src/libserver/dns.h | 3 +-
src/libserver/events.c | 301 +---
src/libserver/events.h | 77 +-
src/libserver/fuzzy_backend_redis.c | 177 +-
src/libserver/html.c | 1 +
src/libserver/mempool_vars_internal.h | 1 +
src/libserver/protocol.c | 2 +-
src/libserver/re_cache.c | 145 +-
src/libserver/re_cache.h | 3 +
.../{symbols_cache.c => rspamd_symcache.c} | 1735 ++++++++++----------
src/libserver/rspamd_symcache.h | 376 +++++
src/libserver/spf.c | 16 +
src/libserver/symbols_cache.h | 308 ----
src/libserver/task.c | 59 +-
src/libserver/task.h | 10 +-
src/libserver/url.c | 1 +
src/libserver/worker_util.c | 1 +
src/libstat/backends/redis_backend.c | 246 +--
src/libstat/classifiers/bayes.c | 145 +-
src/libstat/classifiers/classifiers.h | 38 +-
src/libstat/classifiers/lua_classifier.c | 15 +-
src/libstat/learn_cache/redis_cache.c | 220 ++-
src/libstat/learn_cache/sqlite3_cache.c | 2 +
src/libstat/stat_api.h | 25 +-
src/libstat/stat_config.c | 78 +-
src/libstat/stat_internal.h | 4 +
src/libstat/stat_process.c | 366 +----
src/libstat/tokenizers/osb.c | 49 +-
src/libstat/tokenizers/tokenizers.c | 521 +++++-
src/libstat/tokenizers/tokenizers.h | 37 +-
src/libutil/addr.c | 2 +-
src/libutil/fstring.c | 18 +-
src/libutil/fstring.h | 15 +-
src/libutil/hash.c | 535 ++++--
src/libutil/hash.h | 53 +-
src/libutil/http.c | 24 +-
src/libutil/http.h | 7 +-
src/libutil/logger.c | 3 +-
src/libutil/logger.h | 6 +
src/libutil/map_helpers.c | 4 +-
src/libutil/mem_pool.c | 10 +-
src/libutil/mem_pool.h | 50 +-
src/libutil/multipattern.c | 11 +-
src/libutil/printf.c | 7 -
src/libutil/printf.h | 1 -
src/libutil/regexp.c | 12 +-
src/libutil/regexp.h | 1 +
src/libutil/shingles.c | 97 +-
src/libutil/str_util.c | 413 ++++-
src/libutil/str_util.h | 35 +-
src/libutil/upstream.c | 179 +-
src/libutil/upstream.h | 44 +
src/libutil/util.c | 43 +-
src/lua/lua_common.c | 186 ++-
src/lua/lua_common.h | 34 +
src/lua/lua_config.c | 201 +--
src/lua/lua_cryptobox.c | 198 +++
src/lua/lua_dns.c | 50 +-
src/lua/lua_dns_resolver.c | 108 +-
src/lua/lua_http.c | 97 +-
src/lua/lua_map.c | 3 +
src/lua/lua_mimepart.c | 358 +++-
src/lua/lua_redis.c | 97 +-
src/lua/lua_regexp.c | 225 ++-
src/lua/lua_rsa.c | 32 +-
src/lua/lua_task.c | 534 +++++-
src/lua/lua_tcp.c | 99 +-
src/lua/lua_upstream.c | 171 +-
src/lua/lua_util.c | 213 ++-
src/plugins/chartable.c | 123 +-
src/plugins/dkim_check.c | 205 ++-
src/plugins/fuzzy_check.c | 750 ++++-----
src/plugins/lua/antivirus.lua | 803 +--------
src/plugins/lua/arc.lua | 11 +-
src/plugins/lua/asn.lua | 5 +-
src/plugins/lua/bayes_expiry.lua | 54 +-
src/plugins/lua/clickhouse.lua | 32 +-
src/plugins/lua/clustering.lua | 15 +-
src/plugins/lua/dcc.lua | 3 +-
src/plugins/lua/dkim_signing.lua | 2 +-
src/plugins/lua/dmarc.lua | 15 +-
src/plugins/lua/elastic.lua | 78 +-
src/plugins/lua/emails.lua | 17 +-
src/plugins/lua/forged_recipients.lua | 48 +-
src/plugins/lua/greylist.lua | 73 +-
src/plugins/lua/metadata_exporter.lua | 1 +
src/plugins/lua/milter_headers.lua | 79 +-
src/plugins/lua/mime_types.lua | 79 +-
src/plugins/lua/neural.lua | 2 +
src/plugins/lua/ratelimit.lua | 238 ++-
src/plugins/lua/rbl.lua | 879 +++++-----
src/plugins/lua/replies.lua | 119 +-
src/plugins/lua/reputation.lua | 107 +-
src/plugins/lua/settings.lua | 141 +-
src/plugins/lua/whitelist.lua | 6 +-
src/plugins/regexp.c | 105 +-
src/plugins/spf.c | 50 +-
src/plugins/surbl.c | 162 +-
src/ragel/smtp_received.rl | 5 +-
src/ragel/smtp_received_parser.rl | 61 +-
src/rspamadm/commands.c | 4 +-
src/rspamadm/configdump.c | 6 +-
src/rspamadm/configtest.c | 4 +-
src/rspamadm/control.c | 4 +-
src/rspamadm/lua_repl.c | 2 +-
src/rspamadm/rspamadm.c | 2 +-
src/rspamd.c | 30 +-
src/rspamd.h | 3 +
src/rspamd_proxy.c | 47 +-
src/worker.c | 75 +-
src/worker_private.h | 8 +-
test/functional/cases/103_password.robot | 8 +-
test/functional/cases/109_composites.robot | 65 +
.../cases/110_statistics/redis-keyed-siphash.robot | 3 -
.../cases/110_statistics/redis-keyed-xxhash.robot | 3 -
.../cases/110_statistics/redis-plain-siphash.robot | 3 -
.../cases/110_statistics/redis-plain-xxhash.robot | 3 -
test/functional/cases/115_dmarc.robot | 10 +
.../cases/210_clickhouse/001_migration.robot | 3 +-
test/functional/cases/210_clickhouse/clickhouse.py | 2 +-
test/functional/cases/280_rules.robot | 44 +
test/functional/cases/290_greylist.robot | 39 +
test/functional/cases/300_rbl.robot | 47 +
test/functional/configs/clickhouse-config.xml | 2 +-
test/functional/configs/composites.conf | 69 +
test/functional/configs/fuzzy.conf | 2 +
test/functional/configs/greylist.conf | 11 +
test/functional/configs/plugins.conf | 48 +-
test/functional/configs/rbl.conf | 43 +
test/functional/lib/rspamd.py | 144 +-
test/functional/lua/composites.lua | 126 ++
test/functional/lua/prepostfilters.lua | 2 +-
test/functional/messages/broken_richtext.eml | 27 +
.../dmarc/{dmarc_tmpfail.eml => pct_none.eml} | 4 +-
.../dmarc/{dmarc_tmpfail.eml => pct_none1.eml} | 4 +-
test/functional/messages/fws_fn.eml | 30 +
test/functional/messages/fws_fp.eml | 56 +
test/functional/messages/fws_tp.eml | 56 +
test/lua/unit/received.lua | 23 +-
test/lua/unit/rsa.lua | 4 +-
test/lua/unit/selectors.lua | 34 +-
test/lua/unit/test.data | 29 +-
test/lua/unit/utf.lua | 72 +-
test/rspamd_lua_pcall_vs_resume_test.c | 12 +
test/rspamd_test_suite.c | 5 +-
test/tools/dump_coveralls.py | 66 +
test/tools/gcov_coveralls.py | 206 +++
test/tools/http_put.py | 51 +
test/{functional/util => tools}/merge_coveralls.py | 63 +-
utils/asn.pl | 252 ++-
utils/cgp_rspamd.pl | 465 +++---
utils/classifier_test.pl | 702 ++++----
utils/fann_train.pl | 138 +-
utils/redirector.pl.in | 850 +++++-----
utils/rspamd_stats.pl | 1206 +++++++-------
245 files changed, 15896 insertions(+), 8863 deletions(-)
More information about the Commits
mailing list