From 41e28d1148a308957735875abb271d22ba0b4432 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 11 Feb 2020 12:34:40 +0000 Subject: [PATCH] [Rework] Further project structure reorganisation --- cmake/Toolset.cmake | 9 - config.h.in | 1 - src/client/rspamc.c | 4 +- src/client/rspamdclient.c | 4 +- src/controller.c | 10 +- src/fuzzy_storage.c | 7 +- src/libmime/scan_result.c | 2 - src/libserver/CMakeLists.txt | 10 +- src/libserver/cfg_file.h | 30 + src/libserver/cfg_utils.c | 379 ++++++++- src/libserver/dynamic_cfg.c | 2 +- .../http}/http_connection.c | 2 +- .../http}/http_connection.h | 0 .../http}/http_context.c | 0 .../http}/http_context.h | 0 .../http}/http_message.c | 4 +- .../http}/http_message.h | 0 .../http}/http_private.h | 0 src/{libutil => libserver/http}/http_router.c | 6 +- src/{libutil => libserver/http}/http_router.h | 0 src/{libutil => libserver/http}/http_util.c | 2 +- src/{libutil => libserver/http}/http_util.h | 0 src/libserver/logger/logger.c | 4 +- src/libserver/logger/logger_file.c | 1 - src/{libutil => libserver/maps}/map.c | 4 +- src/{libutil => libserver/maps}/map.h | 0 src/{libutil => libserver/maps}/map_helpers.c | 0 src/{libutil => libserver/maps}/map_helpers.h | 0 src/{libutil => libserver/maps}/map_private.h | 0 src/libserver/milter.c | 4 +- src/libserver/protocol.c | 2 +- src/libserver/protocol.h | 2 +- src/libserver/rspamd_control.c | 4 +- src/{libutil => libserver}/ssl_util.c | 49 ++ src/{libutil => libserver}/ssl_util.h | 3 + src/libserver/task.h | 2 +- src/libserver/worker_util.c | 21 +- src/libserver/worker_util.h | 2 +- src/libutil/CMakeLists.txt | 10 +- src/libutil/addr.c | 5 +- src/libutil/util.c | 739 +----------------- src/libutil/util.h | 88 +-- src/lua/lua_http.c | 2 +- src/lua/lua_logger.c | 4 +- src/lua/lua_map.c | 6 +- src/lua/lua_task.c | 2 +- src/lua/lua_tcp.c | 2 +- src/plugins/dkim_check.c | 4 +- src/plugins/fuzzy_check.c | 9 +- src/plugins/regexp.c | 2 +- src/rspamadm/control.c | 4 +- src/rspamadm/lua_repl.c | 6 +- src/rspamadm/rspamadm.c | 1 - src/rspamd.c | 56 +- src/rspamd.h | 23 +- src/rspamd_proxy.c | 6 +- src/worker.c | 4 +- test/rspamd_http_test.c | 2 - utils/rspamd_http_server.c | 2 - 59 files changed, 619 insertions(+), 928 deletions(-) rename src/{libutil => libserver/http}/http_connection.c (99%) rename src/{libutil => libserver/http}/http_connection.h (100%) rename src/{libutil => libserver/http}/http_context.c (100%) rename src/{libutil => libserver/http}/http_context.h (100%) rename src/{libutil => libserver/http}/http_message.c (99%) rename src/{libutil => libserver/http}/http_message.h (100%) rename src/{libutil => libserver/http}/http_private.h (100%) rename src/{libutil => libserver/http}/http_router.c (99%) rename src/{libutil => libserver/http}/http_router.h (100%) rename src/{libutil => libserver/http}/http_util.c (99%) rename src/{libutil => libserver/http}/http_util.h (100%) rename src/{libutil => libserver/maps}/map.c (99%) rename src/{libutil => libserver/maps}/map.h (100%) rename src/{libutil => libserver/maps}/map_helpers.c (100%) rename src/{libutil => libserver/maps}/map_helpers.h (100%) rename src/{libutil => libserver/maps}/map_private.h (100%) rename src/{libutil => libserver}/ssl_util.c (94%) rename src/{libutil => libserver}/ssl_util.h (97%) diff --git a/cmake/Toolset.cmake b/cmake/Toolset.cmake index 673479f11..02b3925e7 100644 --- a/cmake/Toolset.cmake +++ b/cmake/Toolset.cmake @@ -88,15 +88,6 @@ else () endif () endif () -# Google performance tools -option (ENABLE_GPERF_TOOLS "Enable google perftools [default: OFF]" OFF) -if (ENABLE_GPERF_TOOLS MATCHES "ON") - ProcessPackage(GPERF LIBRARY profiler INCLUDE profiler.h INCLUDE_SUFFIXES include/google - ROOT ${GPERF_ROOT_DIR}) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") - set (WITH_GPERF_TOOLS 1) -endif (ENABLE_GPERF_TOOLS MATCHES "ON") # Legacy options support option (ENABLE_COVERAGE "Build rspamd with code coverage options [default: OFF]" OFF) diff --git a/config.h.in b/config.h.in index 2f4eef401..cad62df81 100644 --- a/config.h.in +++ b/config.h.in @@ -146,7 +146,6 @@ #cmakedefine WITH_LUA 1 #cmakedefine WITH_LUAJIT 1 #cmakedefine WITH_PCRE2 1 -#cmakedefine WITH_PROFILER 1 #cmakedefine WITH_SNOWBALL 1 #cmakedefine WITH_SQLITE 1 #cmakedefine WITH_SYSTEM_HIREDIS 1 diff --git a/src/client/rspamc.c b/src/client/rspamc.c index 6ca3de668..f759ec610 100644 --- a/src/client/rspamc.c +++ b/src/client/rspamc.c @@ -15,8 +15,8 @@ */ #include "config.h" #include "libutil/util.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "rspamdclient.h" #include "utlist.h" #include "unix-std.h" diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c index e80926087..98b51506b 100644 --- a/src/client/rspamdclient.c +++ b/src/client/rspamdclient.c @@ -15,8 +15,8 @@ */ #include "rspamdclient.h" #include "libutil/util.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "libserver/protocol_internal.h" #include "unix-std.h" #include "contrib/zstd/zstd.h" diff --git a/src/controller.c b/src/controller.c index 23ff7237b..31c353e34 100644 --- a/src/controller.c +++ b/src/controller.c @@ -17,11 +17,11 @@ #include "libserver/dynamic_cfg.h" #include "libserver/cfg_file_private.h" #include "libutil/rrd.h" -#include "libutil/map.h" -#include "libutil/map_helpers.h" -#include "libutil/map_private.h" -#include "libutil/http_private.h" -#include "libutil/http_router.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" +#include "libserver/maps/map_private.h" +#include "libserver/http/http_private.h" +#include "libserver/http/http_router.h" #include "libstat/stat_api.h" #include "rspamd.h" #include "libserver/worker_util.h" diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c index 5bc8cf29d..f91fb61ac 100644 --- a/src/fuzzy_storage.c +++ b/src/fuzzy_storage.c @@ -21,8 +21,8 @@ #include "libserver/fuzzy_wire.h" #include "util.h" #include "rspamd.h" -#include "map.h" -#include "map_helpers.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" #include "fuzzy_wire.h" #include "libserver/fuzzy_backend/fuzzy_backend.h" #include "ottery.h" @@ -33,9 +33,8 @@ #include "libcryptobox/cryptobox.h" #include "libcryptobox/keypairs_cache.h" #include "libcryptobox/keypair.h" -#include "libserver/rspamd_control.h" #include "libutil/hash.h" -#include "libutil/map_private.h" +#include "libserver/maps/map_private.h" #include "contrib/uthash/utlist.h" #include "unix-std.h" diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c index e95f26799..babf80abe 100644 --- a/src/libmime/scan_result.c +++ b/src/libmime/scan_result.c @@ -510,8 +510,6 @@ rspamd_task_option_safe_copy (struct rspamd_task *task, gsize *outlen) { const gchar *p, *end; - off_t r; - UChar32 uc; p = val; end = val + vlen; diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt index 4b999c900..635c65b13 100644 --- a/src/libserver/CMakeLists.txt +++ b/src/libserver/CMakeLists.txt @@ -18,6 +18,7 @@ SET(LIBRSPAMDSERVERSRC ${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c ${CMAKE_CURRENT_SOURCE_DIR}/roll_history.c ${CMAKE_CURRENT_SOURCE_DIR}/spf.c + ${CMAKE_CURRENT_SOURCE_DIR}/ssl_util.c ${CMAKE_CURRENT_SOURCE_DIR}/rspamd_symcache.c ${CMAKE_CURRENT_SOURCE_DIR}/task.c ${CMAKE_CURRENT_SOURCE_DIR}/url.c @@ -25,7 +26,14 @@ SET(LIBRSPAMDSERVERSRC ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger.c ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_file.c ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_syslog.c - ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_console.c) + ${CMAKE_CURRENT_SOURCE_DIR}/logger/logger_console.c + ${CMAKE_CURRENT_SOURCE_DIR}/http/http_util.c + ${CMAKE_CURRENT_SOURCE_DIR}/http/http_message.c + ${CMAKE_CURRENT_SOURCE_DIR}/http/http_connection.c + ${CMAKE_CURRENT_SOURCE_DIR}/http/http_router.c + ${CMAKE_CURRENT_SOURCE_DIR}/http/http_context.c + ${CMAKE_CURRENT_SOURCE_DIR}/maps/map.c + ${CMAKE_CURRENT_SOURCE_DIR}/maps/map_helpers.c) # Librspamd-server SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE) diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index cf1532692..4a8ab5bfc 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -821,6 +821,36 @@ struct rspamd_action *rspamd_config_get_action_by_type (struct rspamd_config *cf int rspamd_config_ev_backend_get (struct rspamd_config *cfg); const gchar * rspamd_config_ev_backend_to_string (int ev_backend, gboolean *effective); +struct rspamd_external_libs_ctx; + +/** + * Initialize rspamd libraries + */ +struct rspamd_external_libs_ctx *rspamd_init_libs (void); + +/** + * Reset and initialize decompressor + * @param ctx + */ +gboolean rspamd_libs_reset_decompression (struct rspamd_external_libs_ctx *ctx); + +/** + * Reset and initialize compressor + * @param ctx + */ +gboolean rspamd_libs_reset_compression (struct rspamd_external_libs_ctx *ctx); + +/** + * Destroy external libraries context + */ +void rspamd_deinit_libs (struct rspamd_external_libs_ctx *ctx); + +/** + * Configure libraries + */ +gboolean rspamd_config_libs (struct rspamd_external_libs_ctx *ctx, + struct rspamd_config *cfg); + #define msg_err_config(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ cfg->cfg_pool->tag.tagname, cfg->checksum, \ G_STRFUNC, \ diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index cd85b73ac..961a2610e 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -21,9 +21,9 @@ #include "scan_result.h" #include "lua/lua_common.h" #include "lua/lua_thread_pool.h" -#include "map.h" -#include "map_helpers.h" -#include "map_private.h" +#include "maps/map.h" +#include "maps/map_helpers.h" +#include "maps/map_private.h" #include "dynamic_cfg.h" #include "utlist.h" #include "stat_api.h" @@ -31,6 +31,26 @@ #include "libutil/multipattern.h" #include "monitored.h" #include "ref.h" +#include "cryptobox.h" +#include "ssl_util.h" +#include "contrib/libottery/ottery.h" +#include "contrib/fastutf8/fastutf8.h" + +#define ZSTD_STATIC_LINKING_ONLY +#include "contrib/zstd/zstd.h" +#include "contrib/zstd/zdict.h" + +#ifdef HAVE_OPENSSL +#include +#include +#include +#include +#include +#include +#endif +#ifdef HAVE_LOCALE_H +#include +#endif #include #define DEFAULT_SCORE 10.0 @@ -2614,4 +2634,357 @@ rspamd_config_ev_backend_to_string (int ev_backend, gboolean *effective) SET_EFFECTIVE (FALSE); return "unknown"; #undef SET_EFFECTIVE +} + +static void +rspamd_openssl_maybe_init (void) +{ + static gboolean openssl_initialized = FALSE; + + if (!openssl_initialized) { + ERR_load_crypto_strings (); + SSL_load_error_strings (); + + OpenSSL_add_all_algorithms (); + OpenSSL_add_all_digests (); + OpenSSL_add_all_ciphers (); + +#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && !defined(LIBRESSL_VERSION_NUMBER) + ENGINE_load_builtin_engines (); +#endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init (); +#else + OPENSSL_init_ssl (0, NULL); +#endif + +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_config (NULL); +#endif + if (RAND_status () == 0) { + guchar seed[128]; + + /* Try to use ottery to seed rand */ + ottery_rand_bytes (seed, sizeof (seed)); + RAND_seed (seed, sizeof (seed)); + rspamd_explicit_memzero (seed, sizeof (seed)); + } + + openssl_initialized = TRUE; + } +} + +struct rspamd_external_libs_ctx * +rspamd_init_libs (void) +{ + struct rlimit rlim; + struct rspamd_external_libs_ctx *ctx; + struct ottery_config *ottery_cfg; + + ctx = g_malloc0 (sizeof (*ctx)); + ctx->crypto_ctx = rspamd_cryptobox_init (); + ottery_cfg = g_malloc0 (ottery_get_sizeof_config ()); + ottery_config_init (ottery_cfg); + ctx->ottery_cfg = ottery_cfg; + + rspamd_openssl_maybe_init (); + + /* Check if we have rdrand */ + if ((ctx->crypto_ctx->cpu_config & CPUID_RDRAND) == 0) { + ottery_config_disable_entropy_sources (ottery_cfg, + OTTERY_ENTROPY_SRC_RDRAND); +#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && !defined(LIBRESSL_VERSION_NUMBER) + RAND_set_rand_engine (NULL); +#endif + } + + /* Configure utf8 library */ + guint utf8_flags = 0; + + if ((ctx->crypto_ctx->cpu_config & CPUID_SSE41)) { + utf8_flags |= RSPAMD_FAST_UTF8_FLAG_SSE41; + } + if ((ctx->crypto_ctx->cpu_config & CPUID_AVX2)) { + utf8_flags |= RSPAMD_FAST_UTF8_FLAG_AVX2; + } + + rspamd_fast_utf8_library_init (utf8_flags); + + g_assert (ottery_init (ottery_cfg) == 0); + +#ifdef HAVE_LOCALE_H + if (getenv ("LANG") == NULL) { + setlocale (LC_ALL, "C"); + setlocale (LC_CTYPE, "C"); + setlocale (LC_MESSAGES, "C"); + setlocale (LC_TIME, "C"); + } + else { + /* Just set the default locale */ + setlocale (LC_ALL, ""); + /* But for some issues we still want C locale */ + setlocale (LC_NUMERIC, "C"); + } +#endif + + ctx->ssl_ctx = rspamd_init_ssl_ctx (); + ctx->ssl_ctx_noverify = rspamd_init_ssl_ctx_noverify (); + rspamd_random_seed_fast (); + + /* Set stack size for pcre */ + getrlimit (RLIMIT_STACK, &rlim); + rlim.rlim_cur = 100 * 1024 * 1024; + rlim.rlim_max = rlim.rlim_cur; + setrlimit (RLIMIT_STACK, &rlim); + + ctx->local_addrs = rspamd_inet_library_init (); + REF_INIT_RETAIN (ctx, rspamd_deinit_libs); + + return ctx; +} + +static struct zstd_dictionary * +rspamd_open_zstd_dictionary (const char *path) +{ + struct zstd_dictionary *dict; + + dict = g_malloc0 (sizeof (*dict)); + dict->dict = rspamd_file_xmap (path, PROT_READ, &dict->size, TRUE); + + if (dict->dict == NULL) { + g_free (dict); + + return NULL; + } + + dict->id = ZDICT_getDictID (dict->dict, dict->size); + + if (dict->id == 0) { + g_free (dict); + + return NULL; + } + + return dict; +} + +static void +rspamd_free_zstd_dictionary (struct zstd_dictionary *dict) +{ + if (dict) { + munmap (dict->dict, dict->size); + g_free (dict); + } +} + +gboolean +rspamd_config_libs (struct rspamd_external_libs_ctx *ctx, + struct rspamd_config *cfg) +{ + static const char secure_ciphers[] = "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4"; + size_t r; + gboolean ret = TRUE; + + g_assert (cfg != NULL); + + if (ctx != NULL) { + if (cfg->local_addrs) { + rspamd_config_radix_from_ucl (cfg, cfg->local_addrs, + "Local addresses", + ctx->local_addrs, + NULL, + NULL); + } + + rspamd_free_zstd_dictionary (ctx->in_dict); + rspamd_free_zstd_dictionary (ctx->out_dict); + + if (ctx->out_zstream) { + ZSTD_freeCStream (ctx->out_zstream); + ctx->out_zstream = NULL; + } + + if (ctx->in_zstream) { + ZSTD_freeDStream (ctx->in_zstream); + ctx->in_zstream = NULL; + } + + if (cfg->zstd_input_dictionary) { + ctx->in_dict = rspamd_open_zstd_dictionary ( + cfg->zstd_input_dictionary); + + if (ctx->in_dict == NULL) { + msg_err_config ("cannot open zstd dictionary in %s", + cfg->zstd_input_dictionary); + } + } + if (cfg->zstd_output_dictionary) { + ctx->out_dict = rspamd_open_zstd_dictionary ( + cfg->zstd_output_dictionary); + + if (ctx->out_dict == NULL) { + msg_err_config ("cannot open zstd dictionary in %s", + cfg->zstd_output_dictionary); + } + } + + if (cfg->fips_mode) { +#ifdef HAVE_FIPS_MODE + int mode = FIPS_mode (); + unsigned long err = (unsigned long)-1; + + /* Toggle FIPS mode */ + if (mode == 0) { + if (FIPS_mode_set (1) != 1) { + err = ERR_get_error (); + } + } + else { + msg_info_config ("OpenSSL FIPS mode is already enabled"); + } + + if (err != (unsigned long)-1) { + msg_err_config ("FIPS_mode_set failed: %s", + ERR_error_string (err, NULL)); + ret = FALSE; + } + else { + msg_info_config ("OpenSSL FIPS mode is enabled"); + } +#else + msg_warn_config ("SSL FIPS mode is enabled but not supported by OpenSSL library!"); +#endif + } + + if (cfg->ssl_ca_path) { + if (SSL_CTX_load_verify_locations (ctx->ssl_ctx, cfg->ssl_ca_path, + NULL) != 1) { + msg_err_config ("cannot load CA certs from %s: %s", + cfg->ssl_ca_path, + ERR_error_string (ERR_get_error (), NULL)); + } + } + else { + msg_debug_config ("ssl_ca_path is not set, using default CA path"); + SSL_CTX_set_default_verify_paths (ctx->ssl_ctx); + } + + if (cfg->ssl_ciphers) { + if (SSL_CTX_set_cipher_list (ctx->ssl_ctx, cfg->ssl_ciphers) != 1) { + msg_err_config ( + "cannot set ciphers set to %s: %s; fallback to %s", + cfg->ssl_ciphers, + ERR_error_string (ERR_get_error (), NULL), + secure_ciphers); + /* Default settings */ + SSL_CTX_set_cipher_list (ctx->ssl_ctx, secure_ciphers); + } + } + + /* Init decompression */ + ctx->in_zstream = ZSTD_createDStream (); + r = ZSTD_initDStream (ctx->in_zstream); + + if (ZSTD_isError (r)) { + msg_err ("cannot init decompression stream: %s", + ZSTD_getErrorName (r)); + ZSTD_freeDStream (ctx->in_zstream); + ctx->in_zstream = NULL; + } + + /* Init compression */ + ctx->out_zstream = ZSTD_createCStream (); + r = ZSTD_initCStream (ctx->out_zstream, 1); + + if (ZSTD_isError (r)) { + msg_err ("cannot init compression stream: %s", + ZSTD_getErrorName (r)); + ZSTD_freeCStream (ctx->out_zstream); + ctx->out_zstream = NULL; + } +#ifdef HAVE_CBLAS + openblas_set_num_threads (cfg->max_blas_threads); +#endif + } + + return ret; +} + +gboolean +rspamd_libs_reset_decompression (struct rspamd_external_libs_ctx *ctx) +{ + gsize r; + + if (ctx->in_zstream == NULL) { + return FALSE; + } + else { + r = ZSTD_resetDStream (ctx->in_zstream); + + if (ZSTD_isError (r)) { + msg_err ("cannot init decompression stream: %s", + ZSTD_getErrorName (r)); + ZSTD_freeDStream (ctx->in_zstream); + ctx->in_zstream = NULL; + + return FALSE; + } + } + + return TRUE; +} + +gboolean +rspamd_libs_reset_compression (struct rspamd_external_libs_ctx *ctx) +{ + gsize r; + + if (ctx->out_zstream == NULL) { + return FALSE; + } + else { + /* Dictionary will be reused automatically if specified */ + r = ZSTD_resetCStream (ctx->out_zstream, 0); + + if (ZSTD_isError (r)) { + msg_err ("cannot init compression stream: %s", + ZSTD_getErrorName (r)); + ZSTD_freeCStream (ctx->out_zstream); + ctx->out_zstream = NULL; + + return FALSE; + } + } + + return TRUE; +} + +void +rspamd_deinit_libs (struct rspamd_external_libs_ctx *ctx) +{ + if (ctx != NULL) { + g_free (ctx->ottery_cfg); + +#ifdef HAVE_OPENSSL + EVP_cleanup (); + ERR_free_strings (); + SSL_CTX_free (ctx->ssl_ctx); + SSL_CTX_free (ctx->ssl_ctx_noverify); +#endif + rspamd_inet_library_destroy (); + rspamd_free_zstd_dictionary (ctx->in_dict); + rspamd_free_zstd_dictionary (ctx->out_dict); + + if (ctx->out_zstream) { + ZSTD_freeCStream (ctx->out_zstream); + } + + if (ctx->in_zstream) { + ZSTD_freeDStream (ctx->in_zstream); + } + + rspamd_cryptobox_deinit (ctx->crypto_ctx); + + g_free (ctx); + } } \ No newline at end of file diff --git a/src/libserver/dynamic_cfg.c b/src/libserver/dynamic_cfg.c index a39778ec2..8b1f464f1 100644 --- a/src/libserver/dynamic_cfg.c +++ b/src/libserver/dynamic_cfg.c @@ -15,7 +15,7 @@ */ #include "config.h" #include "rspamd.h" -#include "map.h" +#include "libserver/maps/map.h" #include "scan_result.h" #include "dynamic_cfg.h" #include "unix-std.h" diff --git a/src/libutil/http_connection.c b/src/libserver/http/http_connection.c similarity index 99% rename from src/libutil/http_connection.c rename to src/libserver/http/http_connection.c index 027dc9d5b..28a13f7ba 100644 --- a/src/libutil/http_connection.c +++ b/src/libserver/http/http_connection.c @@ -26,7 +26,7 @@ #include "keypair_private.h" #include "cryptobox.h" #include "libutil/libev_helper.h" -#include "libutil/ssl_util.h" +#include "libserver/ssl_util.h" #include "libserver/url.h" #include "contrib/mumhash/mum.h" diff --git a/src/libutil/http_connection.h b/src/libserver/http/http_connection.h similarity index 100% rename from src/libutil/http_connection.h rename to src/libserver/http/http_connection.h diff --git a/src/libutil/http_context.c b/src/libserver/http/http_context.c similarity index 100% rename from src/libutil/http_context.c rename to src/libserver/http/http_context.c diff --git a/src/libutil/http_context.h b/src/libserver/http/http_context.h similarity index 100% rename from src/libutil/http_context.h rename to src/libserver/http/http_context.h diff --git a/src/libutil/http_message.c b/src/libserver/http/http_message.c similarity index 99% rename from src/libutil/http_message.c rename to src/libserver/http/http_message.c index 0e12401a9..5f9d22178 100644 --- a/src/libutil/http_message.c +++ b/src/libserver/http/http_message.c @@ -14,8 +14,8 @@ * limitations under the License. */ #include "http_message.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "http_connection.h" +#include "http_private.h" #include "libutil/printf.h" #include "libserver/logger.h" #include "utlist.h" diff --git a/src/libutil/http_message.h b/src/libserver/http/http_message.h similarity index 100% rename from src/libutil/http_message.h rename to src/libserver/http/http_message.h diff --git a/src/libutil/http_private.h b/src/libserver/http/http_private.h similarity index 100% rename from src/libutil/http_private.h rename to src/libserver/http/http_private.h diff --git a/src/libutil/http_router.c b/src/libserver/http/http_router.c similarity index 99% rename from src/libutil/http_router.c rename to src/libserver/http/http_router.c index 1e4e656c2..01d47b612 100644 --- a/src/libutil/http_router.c +++ b/src/libserver/http/http_router.c @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "libutil/http_router.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "http_router.h" +#include "http_connection.h" +#include "http_private.h" #include "libutil/regexp.h" #include "libutil/printf.h" #include "libserver/logger.h" diff --git a/src/libutil/http_router.h b/src/libserver/http/http_router.h similarity index 100% rename from src/libutil/http_router.h rename to src/libserver/http/http_router.h diff --git a/src/libutil/http_util.c b/src/libserver/http/http_util.c similarity index 99% rename from src/libutil/http_util.c rename to src/libserver/http/http_util.c index 8fb658e08..89e74a94b 100644 --- a/src/libutil/http_util.c +++ b/src/libserver/http/http_util.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "libutil/http_util.h" +#include "libserver/http/http_util.h" #include "libutil/printf.h" #include "libutil/util.h" diff --git a/src/libutil/http_util.h b/src/libserver/http/http_util.h similarity index 100% rename from src/libutil/http_util.h rename to src/libserver/http/http_util.h diff --git a/src/libserver/logger/logger.c b/src/libserver/logger/logger.c index 568c0b8e9..4e48eae4e 100644 --- a/src/libserver/logger/logger.c +++ b/src/libserver/logger/logger.c @@ -16,8 +16,8 @@ #include "config.h" #include "logger.h" #include "rspamd.h" -#include "map.h" -#include "map_helpers.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" #include "ottery.h" #include "unix-std.h" #include "logger_private.h" diff --git a/src/libserver/logger/logger_file.c b/src/libserver/logger/logger_file.c index 9a242ac61..d8ce15de2 100644 --- a/src/libserver/logger/logger_file.c +++ b/src/libserver/logger/logger_file.c @@ -89,7 +89,6 @@ direct_write_log_line (rspamd_logger_t *rspamd_log, gboolean is_iov, gint level_flags) { - gchar errmsg[128]; struct iovec *iov; const gchar *line; glong r; diff --git a/src/libutil/map.c b/src/libserver/maps/map.c similarity index 99% rename from src/libutil/map.c rename to src/libserver/maps/map.c index e5aae11ea..ff3a38f90 100644 --- a/src/libutil/map.c +++ b/src/libserver/maps/map.c @@ -20,8 +20,8 @@ #include "config.h" #include "map.h" #include "map_private.h" -#include "http_connection.h" -#include "http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "rspamd.h" #include "contrib/zstd/zstd.h" #include "contrib/libev/ev.h" diff --git a/src/libutil/map.h b/src/libserver/maps/map.h similarity index 100% rename from src/libutil/map.h rename to src/libserver/maps/map.h diff --git a/src/libutil/map_helpers.c b/src/libserver/maps/map_helpers.c similarity index 100% rename from src/libutil/map_helpers.c rename to src/libserver/maps/map_helpers.c diff --git a/src/libutil/map_helpers.h b/src/libserver/maps/map_helpers.h similarity index 100% rename from src/libutil/map_helpers.h rename to src/libserver/maps/map_helpers.h diff --git a/src/libutil/map_private.h b/src/libserver/maps/map_private.h similarity index 100% rename from src/libutil/map_private.h rename to src/libserver/maps/map_private.h diff --git a/src/libserver/milter.c b/src/libserver/milter.c index 3a12b08a9..26e1fd1cd 100644 --- a/src/libserver/milter.c +++ b/src/libserver/milter.c @@ -22,8 +22,8 @@ #include "unix-std.h" #include "logger.h" #include "ottery.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "libserver/protocol_internal.h" #include "libserver/cfg_file_private.h" #include "libmime/scan_result.h" diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index a700ad180..727ada37f 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -17,7 +17,7 @@ #include "rspamd.h" #include "message.h" #include "utlist.h" -#include "http_private.h" +#include "libserver/http/http_private.h" #include "worker_private.h" #include "libserver/cfg_file_private.h" #include "libmime/scan_result_private.h" diff --git a/src/libserver/protocol.h b/src/libserver/protocol.h index 2ba10e926..460e70fd6 100644 --- a/src/libserver/protocol.h +++ b/src/libserver/protocol.h @@ -8,7 +8,7 @@ #include "config.h" #include "scan_result.h" -#include "http_connection.h" +#include "libserver/http/http_connection.h" #include "task.h" #ifdef __cplusplus diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c index e119e64d4..cb2efecb9 100644 --- a/src/libserver/rspamd_control.c +++ b/src/libserver/rspamd_control.c @@ -17,8 +17,8 @@ #include "rspamd.h" #include "rspamd_control.h" #include "worker_util.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "libutil/libev_helper.h" #include "unix-std.h" #include "utlist.h" diff --git a/src/libutil/ssl_util.c b/src/libserver/ssl_util.c similarity index 94% rename from src/libutil/ssl_util.c rename to src/libserver/ssl_util.c index 4760a3c78..bff4d5014 100644 --- a/src/libutil/ssl_util.c +++ b/src/libserver/ssl_util.c @@ -922,3 +922,52 @@ rspamd_ssl_connection_free (struct rspamd_ssl_connection *conn) } } } + +gpointer +rspamd_init_ssl_ctx (void) +{ + SSL_CTX *ssl_ctx; + gint ssl_options; + + rspamd_openssl_maybe_init (); + + ssl_ctx = SSL_CTX_new (SSLv23_method ()); + SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, NULL); + SSL_CTX_set_verify_depth (ssl_ctx, 4); + ssl_options = SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; + +#ifdef SSL_OP_NO_COMPRESSION + ssl_options |= SSL_OP_NO_COMPRESSION; +#elif OPENSSL_VERSION_NUMBER >= 0x00908000L + sk_SSL_COMP_zero (SSL_COMP_get_compression_methods ()); +#endif + + SSL_CTX_set_options (ssl_ctx, ssl_options); + + return ssl_ctx; +} + +gpointer rspamd_init_ssl_ctx_noverify (void) +{ + SSL_CTX *ssl_ctx_noverify; + gint ssl_options; + + rspamd_openssl_maybe_init (); + + ssl_options = SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; + +#ifdef SSL_OP_NO_COMPRESSION + ssl_options |= SSL_OP_NO_COMPRESSION; +#elif OPENSSL_VERSION_NUMBER >= 0x00908000L + sk_SSL_COMP_zero (SSL_COMP_get_compression_methods ()); +#endif + + ssl_ctx_noverify = SSL_CTX_new (SSLv23_method ()); + SSL_CTX_set_verify (ssl_ctx_noverify, SSL_VERIFY_NONE, NULL); + SSL_CTX_set_options (ssl_ctx_noverify, ssl_options); +#ifdef SSL_SESS_CACHE_BOTH + SSL_CTX_set_session_cache_mode (ssl_ctx_noverify, SSL_SESS_CACHE_BOTH); +#endif + + return ssl_ctx_noverify; +} diff --git a/src/libutil/ssl_util.h b/src/libserver/ssl_util.h similarity index 97% rename from src/libutil/ssl_util.h rename to src/libserver/ssl_util.h index c934bebaa..708c07930 100644 --- a/src/libutil/ssl_util.h +++ b/src/libserver/ssl_util.h @@ -94,6 +94,9 @@ gssize rspamd_ssl_writev (struct rspamd_ssl_connection *conn, struct iovec *iov, */ void rspamd_ssl_connection_free (struct rspamd_ssl_connection *conn); +gpointer rspamd_init_ssl_ctx (void); +gpointer rspamd_init_ssl_ctx_noverify (void); + #ifdef __cplusplus } #endif diff --git a/src/libserver/task.h b/src/libserver/task.h index 50e07b23f..778b77dbf 100644 --- a/src/libserver/task.h +++ b/src/libserver/task.h @@ -17,7 +17,7 @@ #define TASK_H_ #include "config.h" -#include "http_connection.h" +#include "libserver/http/http_connection.h" #include "async_session.h" #include "util.h" #include "mem_pool.h" diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c index ebc6a1980..ceb2f1103 100644 --- a/src/libserver/worker_util.c +++ b/src/libserver/worker_util.c @@ -21,15 +21,12 @@ #include "utlist.h" #include "ottery.h" #include "rspamd_control.h" -#include "libutil/map.h" -#include "libutil/map_private.h" -#include "libutil/http_private.h" -#include "libutil/http_router.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_private.h" +#include "libserver/http/http_private.h" +#include "libserver/http/http_router.h" #include "libutil/rrd.h" -#ifdef WITH_GPERF_TOOLS -#include -#endif /* sys/resource.h */ #ifdef HAVE_SYS_RESOURCE_H #include @@ -218,9 +215,6 @@ rspamd_worker_on_delayed_shutdown (EV_P_ ev_timer *w, int revents) worker->state = rspamd_worker_wanna_die; ev_timer_stop (EV_A_ w); ev_break (loop, EVBREAK_ALL); -#ifdef WITH_GPERF_TOOLS - ProfilerStop (); -#endif } static void @@ -481,13 +475,6 @@ rspamd_prepare_worker (struct rspamd_worker *worker, const char *name, struct rspamd_worker_listen_socket *ls; struct rspamd_worker_accept_event *accept_ev; -#ifdef WITH_PROFILER - extern void _start (void), etext (void); - monstartup ((u_long) & _start, (u_long) & etext); -#endif - - gperf_profiler_init (worker->srv->cfg, name); - worker->signal_events = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, rspamd_sigh_free); diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h index 298243961..0e9e60545 100644 --- a/src/libserver/worker_util.h +++ b/src/libserver/worker_util.h @@ -18,7 +18,7 @@ #include "config.h" #include "util.h" -#include "http_connection.h" +#include "libserver/http/http_connection.h" #include "rspamd.h" #ifdef __cplusplus diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt index d26067df1..64cc8ee1e 100644 --- a/src/libutil/CMakeLists.txt +++ b/src/libutil/CMakeLists.txt @@ -5,13 +5,6 @@ SET(LIBRSPAMDUTILSRC ${CMAKE_CURRENT_SOURCE_DIR}/expression.c ${CMAKE_CURRENT_SOURCE_DIR}/fstring.c ${CMAKE_CURRENT_SOURCE_DIR}/hash.c - ${CMAKE_CURRENT_SOURCE_DIR}/http_util.c - ${CMAKE_CURRENT_SOURCE_DIR}/http_message.c - ${CMAKE_CURRENT_SOURCE_DIR}/http_connection.c - ${CMAKE_CURRENT_SOURCE_DIR}/http_router.c - ${CMAKE_CURRENT_SOURCE_DIR}/http_context.c - ${CMAKE_CURRENT_SOURCE_DIR}/map.c - ${CMAKE_CURRENT_SOURCE_DIR}/map_helpers.c ${CMAKE_CURRENT_SOURCE_DIR}/mem_pool.c ${CMAKE_CURRENT_SOURCE_DIR}/printf.c ${CMAKE_CURRENT_SOURCE_DIR}/radix.c @@ -23,7 +16,6 @@ SET(LIBRSPAMDUTILSRC ${CMAKE_CURRENT_SOURCE_DIR}/upstream.c ${CMAKE_CURRENT_SOURCE_DIR}/util.c ${CMAKE_CURRENT_SOURCE_DIR}/heap.c - ${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c - ${CMAKE_CURRENT_SOURCE_DIR}/ssl_util.c) + ${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c) # Rspamdutil SET(RSPAMD_UTIL ${LIBRSPAMDUTILSRC} PARENT_SCOPE) \ No newline at end of file diff --git a/src/libutil/addr.c b/src/libutil/addr.c index 27e63cd79..c0cb2d19d 100644 --- a/src/libutil/addr.c +++ b/src/libutil/addr.c @@ -16,7 +16,10 @@ #include "config.h" #include "addr.h" #include "util.h" -#include "map_helpers.h" +/* + * TODO: fix this cross dependency! + */ +#include "libserver/maps/map_helpers.h" #include "logger.h" #include "cryptobox.h" #include "unix-std.h" diff --git a/src/libutil/util.c b/src/libutil/util.c index 119082964..0e3a7b97e 100644 --- a/src/libutil/util.c +++ b/src/libutil/util.c @@ -15,26 +15,11 @@ */ #include "config.h" #include "util.h" -#include "cfg_file.h" -#include "rspamd.h" #include "unix-std.h" #include "xxhash.h" #include "ottery.h" #include "cryptobox.h" -#include "libutil/map.h" -#define ZSTD_STATIC_LINKING_ONLY -#include "contrib/zstd/zstd.h" -#include "contrib/zstd/zdict.h" - -#ifdef HAVE_OPENSSL -#include -#include -#include -#include -#include -#include -#endif #ifdef HAVE_TERMIOS_H #include @@ -42,9 +27,6 @@ #ifdef HAVE_READPASSPHRASE_H #include #endif -#ifdef HAVE_LOCALE_H -#include -#endif /* libutil */ #ifdef HAVE_LIBUTIL_H #include @@ -55,9 +37,6 @@ #include #include #endif -#ifdef WITH_GPERF_TOOLS -#include -#endif /* poll */ #ifdef HAVE_POLL_H #include @@ -83,10 +62,8 @@ #include /* for pow */ #include /* in fact, we require this file ultimately */ -#include "cryptobox.h" #include "zlib.h" #include "contrib/uthash/utlist.h" -#include "contrib/fastutf8/fastutf8.h" /* Check log messages intensity once per minute */ #define CHECK_TIME 60 @@ -95,6 +72,9 @@ /* Default connect timeout for sync sockets */ #define CONNECT_TIMEOUT 3 +/* + * Should be defined in a single point + */ const struct rspamd_controller_pbkdf pbkdf_list[] = { { .name = "PBKDF2-blake2b", @@ -126,7 +106,6 @@ rspamd_socket_nonblocking (gint fd) ofl = fcntl (fd, F_GETFL, 0); if (fcntl (fd, F_SETFL, ofl | O_NONBLOCK) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); return -1; } return 0; @@ -140,7 +119,6 @@ rspamd_socket_blocking (gint fd) ofl = fcntl (fd, F_GETFL, 0); if (fcntl (fd, F_SETFL, ofl & (~O_NONBLOCK)) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); return -1; } return 0; @@ -171,13 +149,11 @@ rspamd_socket_create (gint af, gint type, gint protocol, gboolean async) fd = socket (af, type, protocol); if (fd == -1) { - msg_warn ("socket failed: %d, '%s'", errno, strerror (errno)); return -1; } /* Set close on exec */ if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); close (fd); return -1; } @@ -209,25 +185,12 @@ rspamd_inet_socket_create (gint type, struct addrinfo *addr, gboolean is_server, } if (is_server) { - if (setsockopt (fd, - SOL_SOCKET, - SO_REUSEADDR, - (const void *)&on, - sizeof (gint)) == -1) { - msg_warn ("setsockopt failed: %d, '%s'", errno, - strerror (errno)); - } + (void)setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, + sizeof (gint)); #ifdef HAVE_IPV6_V6ONLY if (cur->ai_family == AF_INET6) { - if (setsockopt (fd, - IPPROTO_IPV6, - IPV6_V6ONLY, - (const void *)&on, - sizeof (gint)) == -1) { - - msg_warn ("setsockopt failed: %d, '%s'", errno, - strerror (errno)); - } + setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void *)&on, + sizeof (gint)); } #endif r = bind (fd, cur->ai_addr, cur->ai_addrlen); @@ -238,8 +201,6 @@ rspamd_inet_socket_create (gint type, struct addrinfo *addr, gboolean is_server, if (r == -1) { if (errno != EINPROGRESS) { - msg_warn ("bind/connect failed: %d, '%s'", errno, - strerror (errno)); goto out; } if (!async) { @@ -247,7 +208,6 @@ rspamd_inet_socket_create (gint type, struct addrinfo *addr, gboolean is_server, if (rspamd_socket_poll (fd, CONNECT_TIMEOUT * 1000, POLLOUT) <= 0) { errno = ETIMEDOUT; - msg_warn ("bind/connect failed: timeout"); goto out; } else { @@ -329,15 +289,10 @@ rspamd_socket_unix (const gchar *path, if (lstat (addr->sun_path, &st) != -1) { if (S_ISSOCK (st.st_mode)) { if (unlink (addr->sun_path) == -1) { - msg_warn ("unlink %s failed: %d, '%s'", - addr->sun_path, - errno, - strerror (errno)); goto out; } } else { - msg_warn ("%s is not a socket", addr->sun_path); goto out; } } @@ -345,10 +300,6 @@ rspamd_socket_unix (const gchar *path, fd = socket (PF_LOCAL, type, 0); if (fd == -1) { - msg_warn ("socket failed %s: %d, '%s'", - addr->sun_path, - errno, - strerror (errno)); return -1; } @@ -358,17 +309,11 @@ rspamd_socket_unix (const gchar *path, /* Set close on exec */ if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1) { - msg_warn ("fcntl failed %s: %d, '%s'", addr->sun_path, errno, - strerror (errno)); goto out; } if (is_server) { - if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, - sizeof (gint)) == -1) { - msg_warn ("setsockopt failed: %d, '%s'", errno, - strerror (errno)); - } - + (void)setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, + sizeof (gint)); r = bind (fd, (struct sockaddr *)addr, SUN_LEN (addr)); } else { @@ -377,17 +322,12 @@ rspamd_socket_unix (const gchar *path, if (r == -1) { if (errno != EINPROGRESS) { - msg_warn ("bind/connect failed %s: %d, '%s'", - addr->sun_path, - errno, - strerror (errno)); goto out; } if (!async) { /* Try to poll */ if (rspamd_socket_poll (fd, CONNECT_TIMEOUT * 1000, POLLOUT) <= 0) { errno = ETIMEDOUT; - msg_warn ("bind/connect failed %s: timeout", addr->sun_path); goto out; } else { @@ -496,139 +436,11 @@ rspamd_socket (const gchar *credits, guint16 port, return r; } else { - msg_err ("address resolution for %s failed: %s", - credits, - gai_strerror (r)); return -1; } } } -/** - * Make universal stream socket - * @param credits host, ip or path to unix socket - * @param port port (used for network sockets) - * @param async make this socket asynced - * @param is_server make this socket as server socket - * @param try_resolve try name resolution for a socket (BLOCKING) - */ -GList * -rspamd_sockets_list (const gchar *credits, guint16 port, - gint type, gboolean async, gboolean is_server, gboolean try_resolve) -{ - struct sockaddr_un un; - struct stat st; - struct addrinfo hints, *res; - gint r, fd = -1, serrno; - gchar portbuf[8], **strv, **cur; - GList *result = NULL, *rcur; - gpointer ptr; - - strv = g_strsplit_set (credits, ",", -1); - if (strv == NULL) { - msg_err ("invalid sockets credentials: %s", credits); - return NULL; - } - cur = strv; - while (*cur != NULL) { - if (*credits == '/') { - if (is_server) { - fd = rspamd_socket_unix (credits, &un, type, is_server, async); - } - else { - r = stat (credits, &st); - if (r == -1) { - /* Unix socket doesn't exists it must be created first */ - errno = ENOENT; - goto err; - } - else { - if ((st.st_mode & S_IFSOCK) == 0) { - /* Path is not valid socket */ - errno = EINVAL; - goto err; - } - else { - fd = rspamd_socket_unix (credits, - &un, - type, - is_server, - async); - } - } - } - if (fd != -1) { - ptr = GINT_TO_POINTER (fd); - result = g_list_prepend (result, ptr); - fd = -1; - } - else { - goto err; - } - } - else { - /* TCP related part */ - memset (&hints, 0, sizeof (hints)); - hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */ - hints.ai_socktype = type; /* Type of the socket */ - hints.ai_flags = is_server ? AI_PASSIVE : 0; - hints.ai_protocol = 0; /* Any protocol */ - hints.ai_canonname = NULL; - hints.ai_addr = NULL; - hints.ai_next = NULL; - - if (!try_resolve) { - hints.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV; - } - - rspamd_snprintf (portbuf, sizeof (portbuf), "%d", (int)port); - if ((r = getaddrinfo (credits, portbuf, &hints, &res)) == 0) { - LL_SORT2 (res, rspamd_prefer_v4_hack, ai_next); - fd = rspamd_inet_socket_create (type, res, is_server, async, - &result); - freeaddrinfo (res); - - if (result == NULL) { - goto err; - } - } - else { - msg_err ("address resolution for %s failed: %s", - credits, - gai_strerror (r)); - goto err; - } - } - - cur++; - } - - g_strfreev (strv); - return result; - -err: - g_strfreev (strv); - serrno = errno; - rcur = result; - while (rcur != NULL) { - ptr = rcur->data; - fd = GPOINTER_TO_INT (ptr); - - if (fd != -1) { - close (fd); - } - - rcur = g_list_next (rcur); - } - - if (result != NULL) { - g_list_free (result); - } - - errno = serrno; - return NULL; -} - gboolean rspamd_socketpair (gint pair[2], gboolean is_stream) { @@ -639,9 +451,6 @@ rspamd_socketpair (gint pair[2], gboolean is_stream) r = socketpair (AF_LOCAL, SOCK_SEQPACKET, 0, pair); if (r == -1) { - msg_warn ("seqpacket socketpair failed: %d, '%s'", - errno, - strerror (errno)); r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); } #else @@ -653,18 +462,14 @@ rspamd_socketpair (gint pair[2], gboolean is_stream) } if (r == -1) { - msg_warn ("socketpair failed: %d, '%s'", errno, strerror ( - errno)); return -1; } /* Set close on exec */ if (fcntl (pair[0], F_SETFD, FD_CLOEXEC) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); goto out; } if (fcntl (pair[1], F_SETFD, FD_CLOEXEC) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); goto out; } @@ -679,37 +484,6 @@ out: return FALSE; } -gint -rspamd_write_pid (struct rspamd_main *main) -{ - pid_t pid; - - if (main->cfg->pid_file == NULL) { - return -1; - } - main->pfh = rspamd_pidfile_open (main->cfg->pid_file, 0644, &pid); - - if (main->pfh == NULL) { - return -1; - } - - if (main->is_privilleged) { - /* Force root user as owner of pid file */ -#ifdef HAVE_PIDFILE_FILENO - if (fchown (pidfile_fileno (main->pfh), 0, 0) == -1) { -#else - if (fchown (main->pfh->pf_fd, 0, 0) == -1) { -#endif - msg_err ("cannot chown of pidfile %s to 0:0 user", - main->cfg->pid_file); - } - } - - rspamd_pidfile_write (main->pfh); - - return 0; -} - #ifdef HAVE_SA_SIGINFO void rspamd_signals_init (struct sigaction *signals, void (*sig_handler)(gint, @@ -769,21 +543,6 @@ rspamd_signals_init (struct sigaction *signals, void (*sig_handler)(gint)) sigaction (SIGPIPE, &sigpipe_act, NULL); } -static void -pass_signal_cb (gpointer key, gpointer value, gpointer ud) -{ - struct rspamd_worker *cur = value; - gint signo = GPOINTER_TO_INT (ud); - - kill (cur->pid, signo); -} - -void -rspamd_pass_signal (GHashTable * workers, gint signo) -{ - g_hash_table_foreach (workers, pass_signal_cb, GINT_TO_POINTER (signo)); -} - #ifndef HAVE_SETPROCTITLE #ifdef LINUX @@ -881,14 +640,14 @@ void rspamd_darwin_title_dtor (void *ud) } static void -rspamd_darwin_init_title (struct rspamd_main *rspamd_main) +rspamd_darwin_init_title (rspamd_mempool_t *pool) { struct rspamd_osx_handles *hdls; /* Assumed that pthreads are already linked */ *(void **)(&dynamic_pthread_setname_np) = dlsym (RTLD_DEFAULT, "pthread_setname_np"); - hdls = rspamd_mempool_alloc0 (rspamd_main->server_pool, sizeof (*hdls)); + hdls = rspamd_mempool_alloc0 (pool, sizeof (*hdls)); hdls->application_services_handle = dlopen("/System/Library/Frameworks/" "ApplicationServices.framework/" @@ -985,7 +744,7 @@ rspamd_darwin_init_title (struct rspamd_main *rspamd_main) goto out; } - rspamd_mempool_add_destructor (rspamd_main->server_pool, + rspamd_mempool_add_destructor (pool, rspamd_darwin_title_dtor, hdls); return; @@ -997,7 +756,7 @@ out: #endif gint -init_title (struct rspamd_main *rspamd_main, +init_title (rspamd_mempool_t *pool, gint argc, gchar *argv[], gchar *envp[]) { #ifdef LINUX @@ -1054,10 +813,10 @@ init_title (struct rspamd_main *rspamd_main, title_buffer = begin_of_buffer; title_buffer_size = end_of_buffer - begin_of_buffer; - rspamd_mempool_add_destructor (rspamd_main->server_pool, + rspamd_mempool_add_destructor (pool, rspamd_title_dtor, new_environ); #elif defined(__APPLE__) - rspamd_darwin_init_title (rspamd_main); + rspamd_darwin_init_title (pool); #endif return 0; @@ -1451,56 +1210,6 @@ rspamd_log_check_time (gdouble start, gdouble end, gint resolution) } -void -gperf_profiler_init (struct rspamd_config *cfg, const gchar *descr) -{ -#if defined(WITH_GPERF_TOOLS) - gchar prof_path[PATH_MAX]; - const gchar *prefix; - - if (getenv ("CPUPROFILE")) { - - /* disable inherited Profiler enabled in master process */ - ProfilerStop (); - } - - if (cfg != NULL) { - /* Try to create temp directory for gmon.out and chdir to it */ - if (cfg->profile_path == NULL) { - cfg->profile_path = - g_strdup_printf ("%s/rspamd-profile", cfg->temp_dir); - } - - prefix = cfg->profile_path; - } - else { - prefix = "/tmp/rspamd-profile"; - } - - snprintf (prof_path, - sizeof (prof_path), - "%s-%s.%d", - prefix, - descr, - (gint)getpid ()); - if (ProfilerStart (prof_path)) { - /* start ITIMER_PROF timer */ - ProfilerRegisterThread (); - } - else { - msg_warn ("cannot start google perftools profiler"); - } -#endif -} - -void -gperf_profiler_stop (void) -{ -#if defined(WITH_GPERF_TOOLS) - ProfilerStop (); -#endif -} - #ifdef HAVE_FLOCK /* Flock version */ gboolean @@ -1520,10 +1229,6 @@ rspamd_file_lock (gint fd, gboolean async) return FALSE; } - if (errno != ENOTSUP) { - msg_warn ("lock on file failed: %s", strerror (errno)); - } - return FALSE; } @@ -1547,10 +1252,6 @@ rspamd_file_unlock (gint fd, gboolean async) return FALSE; } - if (errno != ENOTSUP) { - msg_warn ("unlock on file failed: %s", strerror (errno)); - } - return FALSE; } @@ -1900,9 +1601,8 @@ restart: errno = ENOTTY; return 0; } - if (fcntl (input, F_SETFD, FD_CLOEXEC) == -1) { - msg_warn ("fcntl failed: %d, '%s'", errno, strerror (errno)); - } + + (void)fcntl (input, F_SETFD, FD_CLOEXEC); /* Turn echo off */ if (tcgetattr (input, &oterm) != 0) { @@ -2171,8 +1871,6 @@ rspamd_shmem_mkstemp (gchar *pattern) break; } else if (errno != EEXIST) { - msg_err ("%s: failed to create temp shmem %s: %s", - G_STRLOC, nbuf, strerror (errno)); g_free (nbuf); return -1; @@ -2223,197 +1921,6 @@ void rspamd_gerror_free_maybe (gpointer p) -static void -rspamd_openssl_maybe_init (void) -{ - static gboolean openssl_initialized = FALSE; - - if (!openssl_initialized) { - ERR_load_crypto_strings (); - SSL_load_error_strings (); - - OpenSSL_add_all_algorithms (); - OpenSSL_add_all_digests (); - OpenSSL_add_all_ciphers (); - -#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && !defined(LIBRESSL_VERSION_NUMBER) - ENGINE_load_builtin_engines (); -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init (); -#else - OPENSSL_init_ssl (0, NULL); -#endif - -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_config (NULL); -#endif - if (RAND_status () == 0) { - guchar seed[128]; - - /* Try to use ottery to seed rand */ - ottery_rand_bytes (seed, sizeof (seed)); - RAND_seed (seed, sizeof (seed)); - rspamd_explicit_memzero (seed, sizeof (seed)); - } - - openssl_initialized = TRUE; - } -} - -gpointer -rspamd_init_ssl_ctx (void) -{ - SSL_CTX *ssl_ctx; - gint ssl_options; - - rspamd_openssl_maybe_init (); - - ssl_ctx = SSL_CTX_new (SSLv23_method ()); - SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, NULL); - SSL_CTX_set_verify_depth (ssl_ctx, 4); - ssl_options = SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; - -#ifdef SSL_OP_NO_COMPRESSION - ssl_options |= SSL_OP_NO_COMPRESSION; -#elif OPENSSL_VERSION_NUMBER >= 0x00908000L - sk_SSL_COMP_zero (SSL_COMP_get_compression_methods ()); -#endif - - SSL_CTX_set_options (ssl_ctx, ssl_options); - - return ssl_ctx; -} - -gpointer rspamd_init_ssl_ctx_noverify (void) -{ - SSL_CTX *ssl_ctx_noverify; - gint ssl_options; - - rspamd_openssl_maybe_init (); - - ssl_options = SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; - -#ifdef SSL_OP_NO_COMPRESSION - ssl_options |= SSL_OP_NO_COMPRESSION; -#elif OPENSSL_VERSION_NUMBER >= 0x00908000L - sk_SSL_COMP_zero (SSL_COMP_get_compression_methods ()); -#endif - - ssl_ctx_noverify = SSL_CTX_new (SSLv23_method ()); - SSL_CTX_set_verify (ssl_ctx_noverify, SSL_VERIFY_NONE, NULL); - SSL_CTX_set_options (ssl_ctx_noverify, ssl_options); -#ifdef SSL_SESS_CACHE_BOTH - SSL_CTX_set_session_cache_mode (ssl_ctx_noverify, SSL_SESS_CACHE_BOTH); -#endif - - return ssl_ctx_noverify; -} - - -struct rspamd_external_libs_ctx * -rspamd_init_libs (void) -{ - struct rlimit rlim; - struct rspamd_external_libs_ctx *ctx; - struct ottery_config *ottery_cfg; - - ctx = g_malloc0 (sizeof (*ctx)); - ctx->crypto_ctx = rspamd_cryptobox_init (); - ottery_cfg = g_malloc0 (ottery_get_sizeof_config ()); - ottery_config_init (ottery_cfg); - ctx->ottery_cfg = ottery_cfg; - - rspamd_openssl_maybe_init (); - - /* Check if we have rdrand */ - if ((ctx->crypto_ctx->cpu_config & CPUID_RDRAND) == 0) { - ottery_config_disable_entropy_sources (ottery_cfg, - OTTERY_ENTROPY_SRC_RDRAND); -#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && !defined(LIBRESSL_VERSION_NUMBER) - RAND_set_rand_engine (NULL); -#endif - } - - /* Configure utf8 library */ - guint utf8_flags = 0; - - if ((ctx->crypto_ctx->cpu_config & CPUID_SSE41)) { - utf8_flags |= RSPAMD_FAST_UTF8_FLAG_SSE41; - } - if ((ctx->crypto_ctx->cpu_config & CPUID_AVX2)) { - utf8_flags |= RSPAMD_FAST_UTF8_FLAG_AVX2; - } - - rspamd_fast_utf8_library_init (utf8_flags); - - g_assert (ottery_init (ottery_cfg) == 0); - -#ifdef HAVE_LOCALE_H - if (getenv ("LANG") == NULL) { - setlocale (LC_ALL, "C"); - setlocale (LC_CTYPE, "C"); - setlocale (LC_MESSAGES, "C"); - setlocale (LC_TIME, "C"); - } - else { - /* Just set the default locale */ - setlocale (LC_ALL, ""); - /* But for some issues we still want C locale */ - setlocale (LC_NUMERIC, "C"); - } -#endif - - ctx->ssl_ctx = rspamd_init_ssl_ctx (); - ctx->ssl_ctx_noverify = rspamd_init_ssl_ctx_noverify (); - rspamd_random_seed_fast (); - - /* Set stack size for pcre */ - getrlimit (RLIMIT_STACK, &rlim); - rlim.rlim_cur = 100 * 1024 * 1024; - rlim.rlim_max = rlim.rlim_cur; - setrlimit (RLIMIT_STACK, &rlim); - - ctx->local_addrs = rspamd_inet_library_init (); - REF_INIT_RETAIN (ctx, rspamd_deinit_libs); - - return ctx; -} - -static struct zstd_dictionary * -rspamd_open_zstd_dictionary (const char *path) -{ - struct zstd_dictionary *dict; - - dict = g_malloc0 (sizeof (*dict)); - dict->dict = rspamd_file_xmap (path, PROT_READ, &dict->size, TRUE); - - if (dict->dict == NULL) { - g_free (dict); - - return NULL; - } - - dict->id = ZDICT_getDictID (dict->dict, dict->size); - - if (dict->id == 0) { - g_free (dict); - - return NULL; - } - - return dict; -} - -static void -rspamd_free_zstd_dictionary (struct zstd_dictionary *dict) -{ - if (dict) { - munmap (dict->dict, dict->size); - g_free (dict); - } -} - #ifdef HAVE_CBLAS #ifdef HAVE_CBLAS_H #include "cblas.h" @@ -2432,218 +1939,6 @@ RSPAMD_CONSTRUCTOR (openblas_stupidity_fix_ctor) } #endif -gboolean -rspamd_config_libs (struct rspamd_external_libs_ctx *ctx, - struct rspamd_config *cfg) -{ - static const char secure_ciphers[] = "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4"; - size_t r; - gboolean ret = TRUE; - - g_assert (cfg != NULL); - - if (ctx != NULL) { - if (cfg->local_addrs) { - rspamd_config_radix_from_ucl (cfg, cfg->local_addrs, - "Local addresses", - ctx->local_addrs, - NULL, - NULL); - } - - rspamd_free_zstd_dictionary (ctx->in_dict); - rspamd_free_zstd_dictionary (ctx->out_dict); - - if (ctx->out_zstream) { - ZSTD_freeCStream (ctx->out_zstream); - ctx->out_zstream = NULL; - } - - if (ctx->in_zstream) { - ZSTD_freeDStream (ctx->in_zstream); - ctx->in_zstream = NULL; - } - - if (cfg->zstd_input_dictionary) { - ctx->in_dict = rspamd_open_zstd_dictionary ( - cfg->zstd_input_dictionary); - - if (ctx->in_dict == NULL) { - msg_err_config ("cannot open zstd dictionary in %s", - cfg->zstd_input_dictionary); - } - } - if (cfg->zstd_output_dictionary) { - ctx->out_dict = rspamd_open_zstd_dictionary ( - cfg->zstd_output_dictionary); - - if (ctx->out_dict == NULL) { - msg_err_config ("cannot open zstd dictionary in %s", - cfg->zstd_output_dictionary); - } - } - - if (cfg->fips_mode) { -#ifdef HAVE_FIPS_MODE - int mode = FIPS_mode (); - unsigned long err = (unsigned long)-1; - - /* Toggle FIPS mode */ - if (mode == 0) { - if (FIPS_mode_set (1) != 1) { - err = ERR_get_error (); - } - } - else { - msg_info_config ("OpenSSL FIPS mode is already enabled"); - } - - if (err != (unsigned long)-1) { - msg_err_config ("FIPS_mode_set failed: %s", - ERR_error_string (err, NULL)); - ret = FALSE; - } - else { - msg_info_config ("OpenSSL FIPS mode is enabled"); - } -#else - msg_warn_config ("SSL FIPS mode is enabled but not supported by OpenSSL library!"); -#endif - } - - if (cfg->ssl_ca_path) { - if (SSL_CTX_load_verify_locations (ctx->ssl_ctx, cfg->ssl_ca_path, - NULL) != 1) { - msg_err_config ("cannot load CA certs from %s: %s", - cfg->ssl_ca_path, - ERR_error_string (ERR_get_error (), NULL)); - } - } - else { - msg_debug_config ("ssl_ca_path is not set, using default CA path"); - SSL_CTX_set_default_verify_paths (ctx->ssl_ctx); - } - - if (cfg->ssl_ciphers) { - if (SSL_CTX_set_cipher_list (ctx->ssl_ctx, cfg->ssl_ciphers) != 1) { - msg_err_config ( - "cannot set ciphers set to %s: %s; fallback to %s", - cfg->ssl_ciphers, - ERR_error_string (ERR_get_error (), NULL), - secure_ciphers); - /* Default settings */ - SSL_CTX_set_cipher_list (ctx->ssl_ctx, secure_ciphers); - } - } - - /* Init decompression */ - ctx->in_zstream = ZSTD_createDStream (); - r = ZSTD_initDStream (ctx->in_zstream); - - if (ZSTD_isError (r)) { - msg_err ("cannot init decompression stream: %s", - ZSTD_getErrorName (r)); - ZSTD_freeDStream (ctx->in_zstream); - ctx->in_zstream = NULL; - } - - /* Init compression */ - ctx->out_zstream = ZSTD_createCStream (); - r = ZSTD_initCStream (ctx->out_zstream, 1); - - if (ZSTD_isError (r)) { - msg_err ("cannot init compression stream: %s", - ZSTD_getErrorName (r)); - ZSTD_freeCStream (ctx->out_zstream); - ctx->out_zstream = NULL; - } -#ifdef HAVE_CBLAS - openblas_set_num_threads (cfg->max_blas_threads); -#endif - } - - return ret; -} - -gboolean -rspamd_libs_reset_decompression (struct rspamd_external_libs_ctx *ctx) -{ - gsize r; - - if (ctx->in_zstream == NULL) { - return FALSE; - } - else { - r = ZSTD_resetDStream (ctx->in_zstream); - - if (ZSTD_isError (r)) { - msg_err ("cannot init decompression stream: %s", - ZSTD_getErrorName (r)); - ZSTD_freeDStream (ctx->in_zstream); - ctx->in_zstream = NULL; - - return FALSE; - } - } - - return TRUE; -} - -gboolean -rspamd_libs_reset_compression (struct rspamd_external_libs_ctx *ctx) -{ - gsize r; - - if (ctx->out_zstream == NULL) { - return FALSE; - } - else { - /* Dictionary will be reused automatically if specified */ - r = ZSTD_resetCStream (ctx->out_zstream, 0); - - if (ZSTD_isError (r)) { - msg_err ("cannot init compression stream: %s", - ZSTD_getErrorName (r)); - ZSTD_freeCStream (ctx->out_zstream); - ctx->out_zstream = NULL; - - return FALSE; - } - } - - return TRUE; -} - -void -rspamd_deinit_libs (struct rspamd_external_libs_ctx *ctx) -{ - if (ctx != NULL) { - g_free (ctx->ottery_cfg); - -#ifdef HAVE_OPENSSL - EVP_cleanup (); - ERR_free_strings (); - SSL_CTX_free (ctx->ssl_ctx); - SSL_CTX_free (ctx->ssl_ctx_noverify); -#endif - rspamd_inet_library_destroy (); - rspamd_free_zstd_dictionary (ctx->in_dict); - rspamd_free_zstd_dictionary (ctx->out_dict); - - if (ctx->out_zstream) { - ZSTD_freeCStream (ctx->out_zstream); - } - - if (ctx->in_zstream) { - ZSTD_freeDStream (ctx->in_zstream); - } - - rspamd_cryptobox_deinit (ctx->crypto_ctx); - - g_free (ctx); - } -} - guint64 rspamd_hash_seed (void) { diff --git a/src/libutil/util.h b/src/libutil/util.h index c52f640aa..367e280f1 100644 --- a/src/libutil/util.h +++ b/src/libutil/util.h @@ -20,8 +20,6 @@ extern "C" { #endif struct rspamd_config; -struct rspamd_main; -struct workq; /** * Create generic socket @@ -64,32 +62,12 @@ gint rspamd_socket_unix (const gchar *, gint rspamd_socket (const gchar *credits, guint16 port, gint type, gboolean async, gboolean is_server, gboolean try_resolve); -/** - * Make a universal sockets - * @param credits host, ip or path to unix socket (several items may be separated by ',') - * @param port port (used for network sockets) - * @param type type of socket (SO_STREAM or SO_DGRAM) - * @param async make this socket asynced - * @param is_server make this socket as server socket - * @param try_resolve try name resolution for a socket (BLOCKING) - */ -GList *rspamd_sockets_list (const gchar *credits, - guint16 port, - gint type, - gboolean async, - gboolean is_server, - gboolean try_resolve); /* * Create socketpair */ gboolean rspamd_socketpair (gint pair[2], gboolean is_stream); -/* - * Write pid to file - */ -gint rspamd_write_pid (struct rspamd_main *); - /* * Make specified socket non-blocking */ @@ -118,17 +96,12 @@ void rspamd_signals_init (struct sigaction *sa, void (*sig_handler) (gint, void rspamd_signals_init (struct sigaction *sa, void (*sig_handler)(gint)); #endif -/* - * Send specified signal to each worker - */ -void rspamd_pass_signal (GHashTable *, gint); - #ifndef HAVE_SETPROCTITLE /* * Process title utility functions */ -gint init_title (struct rspamd_main *, gint argc, gchar *argv[], gchar *envp[]); +gint init_title (rspamd_mempool_t *pool, gint argc, gchar *argv[], gchar *envp[]); gint setproctitle (const gchar *fmt, ...); @@ -187,13 +160,6 @@ gboolean rspamd_file_lock (gint fd, gboolean async); gboolean rspamd_file_unlock (gint fd, gboolean async); -/* - * Google perf-tools initialization function - */ -void gperf_profiler_init (struct rspamd_config *cfg, const gchar *descr); - -void gperf_profiler_stop (void); - /* * Workarounds for older versions of glib */ @@ -354,39 +320,6 @@ void rspamd_gerror_free_maybe (gpointer p); */ void rspamd_gstring_free_soft (gpointer p); -struct rspamd_external_libs_ctx; - -/** - * Initialize rspamd libraries - */ -struct rspamd_external_libs_ctx *rspamd_init_libs (void); - -gpointer rspamd_init_ssl_ctx (void); - -gpointer rspamd_init_ssl_ctx_noverify (void); - -/** - * Configure libraries - */ -gboolean rspamd_config_libs (struct rspamd_external_libs_ctx *ctx, - struct rspamd_config *cfg); - -/** - * Reset and initialize decompressor - * @param ctx - */ -gboolean rspamd_libs_reset_decompression (struct rspamd_external_libs_ctx *ctx); - -/** - * Reset and initialize compressor - * @param ctx - */ -gboolean rspamd_libs_reset_compression (struct rspamd_external_libs_ctx *ctx); - -/** - * Destroy external libraries context - */ -void rspamd_deinit_libs (struct rspamd_external_libs_ctx *ctx); /** * Returns some statically initialized random hash seed @@ -545,6 +478,25 @@ double rspamd_set_counter_ema (struct rspamd_counter_data *cd, double rspamd_set_counter (struct rspamd_counter_data *cd, gdouble value); +enum rspamd_pbkdf_version_id { + RSPAMD_PBKDF_ID_V1 = 1, + RSPAMD_PBKDF_ID_V2 = 2, + RSPAMD_PBKDF_ID_MAX +}; + +struct rspamd_controller_pbkdf { + const char *name; + const char *alias; + const char *description; + int type; /* enum rspamd_cryptobox_pbkdf_type */ + gint id; + guint complexity; + gsize salt_len; + gsize key_len; +}; + +extern const struct rspamd_controller_pbkdf pbkdf_list[]; + #ifdef __cplusplus } #endif diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c index 677db488f..3fee28583 100644 --- a/src/lua/lua_http.c +++ b/src/lua/lua_http.c @@ -15,7 +15,7 @@ */ #include "lua_common.h" #include "lua_thread_pool.h" -#include "http_private.h" +#include "libserver/http/http_private.h" #include "ref.h" #include "unix-std.h" #include "zlib.h" diff --git a/src/lua/lua_logger.c b/src/lua/lua_logger.c index 7902babb8..ccf6087de 100644 --- a/src/lua/lua_logger.c +++ b/src/lua/lua_logger.c @@ -14,8 +14,8 @@ * limitations under the License. */ #include "lua_common.h" -#include "libutil/map.h" -#include "libutil/map_private.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_private.h" /*** * @module rspamd_logger diff --git a/src/lua/lua_map.c b/src/lua/lua_map.c index 13674e6b1..ed37625d5 100644 --- a/src/lua/lua_map.c +++ b/src/lua/lua_map.c @@ -15,9 +15,9 @@ */ #include "lua_common.h" -#include "libutil/map.h" -#include "libutil/map_helpers.h" -#include "libutil/map_private.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" +#include "libserver/maps/map_private.h" #include "contrib/libucl/lua_ucl.h" /*** diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index 7fd99a553..5bb61644d 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -26,7 +26,7 @@ #include "libserver/cfg_file_private.h" #include "libmime/scan_result_private.h" #include "libstat/stat_api.h" -#include "libutil/map_helpers.h" +#include "libserver/maps/map_helpers.h" #include diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c index f9595da36..5a34475bc 100644 --- a/src/lua/lua_tcp.c +++ b/src/lua/lua_tcp.c @@ -15,7 +15,7 @@ */ #include "lua_common.h" #include "lua_thread_pool.h" -#include "libutil/ssl_util.h" +#include "libserver/ssl_util.h" #include "utlist.h" #include "unix-std.h" #include diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 133feef2f..9313b643f 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -34,8 +34,8 @@ #include "libmime/message.h" #include "libserver/dkim.h" #include "libutil/hash.h" -#include "libutil/map.h" -#include "libutil/map_helpers.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" #include "rspamd.h" #include "utlist.h" #include "unix-std.h" diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index c7bd0e6e9..aaab34ccb 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -32,8 +32,8 @@ #include "config.h" #include "libmime/message.h" -#include "libutil/map.h" -#include "libutil/map_helpers.h" +#include "libserver/maps/map.h" +#include "libserver/maps/map_helpers.h" #include "libmime/images.h" #include "libserver/worker_util.h" #include "libserver/mempool_vars_internal.h" @@ -42,11 +42,10 @@ #include "ottery.h" #include "lua/lua_common.h" #include "unix-std.h" -#include "libutil/http_private.h" -#include "libutil/http_router.h" +#include "libserver/http/http_private.h" +#include "libserver/http/http_router.h" #include "libstat/stat_api.h" #include -#include #include "libutil/libev_helper.h" #define DEFAULT_SYMBOL "R_FUZZY_HASH" diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c index 1b6e0f3f2..a967c46aa 100644 --- a/src/plugins/regexp.c +++ b/src/plugins/regexp.c @@ -22,7 +22,7 @@ #include "libmime/message.h" #include "expression.h" #include "mime_expressions.h" -#include "libutil/map.h" +#include "libserver/maps/map.h" #include "lua/lua_common.h" static const guint64 rspamd_regexp_cb_magic = 0xca9d9649fc3e2659ULL; diff --git a/src/rspamadm/control.c b/src/rspamadm/control.c index a089b70f7..7bf2a3145 100644 --- a/src/rspamadm/control.c +++ b/src/rspamadm/control.c @@ -17,8 +17,8 @@ #include "rspamadm.h" #include "cryptobox.h" #include "printf.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "addr.h" #include "unix-std.h" #include "contrib/libev/ev.h" diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c index cb15defee..31e06626e 100644 --- a/src/rspamadm/lua_repl.c +++ b/src/rspamadm/lua_repl.c @@ -16,9 +16,9 @@ #include "config.h" #include "rspamadm.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" -#include "libutil/http_router.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" +#include "libserver/http/http_router.h" #include "printf.h" #include "lua/lua_common.h" #include "lua/lua_thread_pool.h" diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c index 1c1d6f52c..5de5e677a 100644 --- a/src/rspamadm/rspamadm.c +++ b/src/rspamadm/rspamadm.c @@ -475,7 +475,6 @@ main (gint argc, gchar **argv, gchar **env) cfg->compiled_modules = modules; cfg->compiled_workers = workers; - gperf_profiler_init (cfg, "rspamadm"); setproctitle ("rspamdadm"); L = cfg->lua_state; diff --git a/src/rspamd.c b/src/rspamd.c index 9a95c416a..02a903479 100644 --- a/src/rspamd.c +++ b/src/rspamd.c @@ -15,7 +15,7 @@ */ #include "config.h" #include "rspamd.h" -#include "libutil/map.h" +#include "libserver/maps/map.h" #include "lua/lua_common.h" #include "libserver/worker_util.h" #include "libserver/rspamd_control.h" @@ -45,9 +45,6 @@ #ifdef HAVE_LIBUTIL_H #include #endif -#ifdef WITH_GPERF_TOOLS -#include -#endif #ifdef HAVE_STROPS_H #include #endif @@ -201,6 +198,35 @@ read_cmd_line (gint *argc, gchar ***argv, struct rspamd_config *cfg) g_option_context_free (context); } +static int +rspamd_write_pid (struct rspamd_main *main) +{ + pid_t pid; + + if (main->cfg->pid_file == NULL) { + return -1; + } + main->pfh = rspamd_pidfile_open (main->cfg->pid_file, 0644, &pid); + + if (main->pfh == NULL) { + return -1; + } + + if (main->is_privilleged) { + /* Force root user as owner of pid file */ +#ifdef HAVE_PIDFILE_FILENO + if (fchown (pidfile_fileno (main->pfh), 0, 0) == -1) { +#else + if (fchown (main->pfh->pf_fd, 0, 0) == -1) { +#endif + } + } + + rspamd_pidfile_write (main->pfh); + + return 0; +} + /* Detect privilleged mode */ static void detect_priv (struct rspamd_main *rspamd_main) @@ -491,6 +517,21 @@ systemd_get_socket (struct rspamd_main *rspamd_main, gint number) return result; } +static void +pass_signal_cb (gpointer key, gpointer value, gpointer ud) +{ + struct rspamd_worker *cur = value; + gint signo = GPOINTER_TO_INT (ud); + + kill (cur->pid, signo); +} + +static void +rspamd_pass_signal (GHashTable * workers, gint signo) +{ + g_hash_table_foreach (workers, pass_signal_cb, GINT_TO_POINTER (signo)); +} + static inline uintptr_t make_listen_key (struct rspamd_worker_bind_conf *cf) { @@ -1188,7 +1229,7 @@ main (gint argc, gchar **argv, gchar **env) } #ifndef HAVE_SETPROCTITLE - init_title (rspamd_main, argc, argv, env); + init_title (rspamd_main->server_pool, argc, argv, env); #endif rspamd_main->cfg->libs_ctx = rspamd_init_libs (); @@ -1278,8 +1319,6 @@ main (gint argc, gchar **argv, gchar **env) rspamd_main->history = rspamd_roll_history_new (rspamd_main->server_pool, rspamd_main->cfg->history_rows, rspamd_main->cfg); - gperf_profiler_init (rspamd_main->cfg, "main"); - msg_info_main ("rspamd " RVERSION " is starting, build id: " @@ -1361,9 +1400,6 @@ main (gint argc, gchar **argv, gchar **env) rspamd_main->cfg->history_file); } -#if defined(WITH_GPERF_TOOLS) - ProfilerStop (); -#endif /* Spawn workers */ rspamd_main->workers = g_hash_table_new (g_direct_hash, g_direct_equal); diff --git a/src/rspamd.h b/src/rspamd.h index 22d957490..be96f0755 100644 --- a/src/rspamd.h +++ b/src/rspamd.h @@ -22,7 +22,7 @@ #include "libutil/mem_pool.h" #include "libutil/util.h" #include "libserver/logger.h" -#include "libutil/http_connection.h" +#include "libserver/http/http_connection.h" #include "libutil/upstream.h" #include "libutil/radix.h" #include "libserver/cfg_file.h" @@ -56,6 +56,8 @@ extern "C" { #endif +struct rspamd_main; + enum rspamd_worker_flags { RSPAMD_WORKER_HAS_SOCKET = (1 << 0), RSPAMD_WORKER_UNIQUE = (1 << 1), @@ -152,17 +154,6 @@ struct rspamd_worker_signal_handler { struct rspamd_worker_signal_handler_elt *cb; }; -struct rspamd_controller_pbkdf { - const char *name; - const char *alias; - const char *description; - enum rspamd_cryptobox_pbkdf_type type; - gint id; - guint complexity; - gsize salt_len; - gsize key_len; -}; - /** * Common structure representing C module context */ @@ -387,14 +378,6 @@ void register_custom_controller_command (const gchar *name, gboolean privilleged, gboolean require_message); -enum rspamd_pbkdf_version_id { - RSPAMD_PBKDF_ID_V1 = 1, - RSPAMD_PBKDF_ID_V2 = 2, - RSPAMD_PBKDF_ID_MAX -}; - -extern const struct rspamd_controller_pbkdf pbkdf_list[]; - #ifdef __cplusplus } #endif diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c index 5050a3f65..f1a557133 100644 --- a/src/rspamd_proxy.c +++ b/src/rspamd_proxy.c @@ -15,10 +15,10 @@ */ #include "config.h" #include "libutil/util.h" -#include "libutil/map.h" +#include "libserver/maps/map.h" #include "libutil/upstream.h" -#include "libutil/http_connection.h" -#include "libutil/http_private.h" +#include "libserver/http/http_connection.h" +#include "libserver/http/http_private.h" #include "libserver/protocol.h" #include "libserver/protocol_internal.h" #include "libserver/cfg_file.h" diff --git a/src/worker.c b/src/worker.c index b75cb0317..4cfe27771 100644 --- a/src/worker.c +++ b/src/worker.c @@ -19,7 +19,7 @@ #include "config.h" #include "libutil/util.h" -#include "libutil/map.h" +#include "libserver/maps/map.h" #include "libutil/upstream.h" #include "libserver/protocol.h" #include "libserver/cfg_file.h" @@ -31,7 +31,7 @@ #include "libserver/worker_util.h" #include "libserver/rspamd_control.h" #include "worker_private.h" -#include "libutil/http_private.h" +#include "libserver/http/http_private.h" #include "libserver/cfg_file_private.h" #include #include "unix-std.h" diff --git a/test/rspamd_http_test.c b/test/rspamd_http_test.c index a813e416c..c783ccf21 100644 --- a/test/rspamd_http_test.c +++ b/test/rspamd_http_test.c @@ -229,9 +229,7 @@ rspamd_http_start_servers (pid_t *sfd, rspamd_inet_addr_t *addr, g_assert (sfd[i] != -1); if (sfd[i] == 0) { - gperf_profiler_init (NULL, "plain-http-server"); rspamd_http_server_func (fd, "/tmp/", addr, serv_key, c); - gperf_profiler_stop (); exit (EXIT_SUCCESS); } } diff --git a/utils/rspamd_http_server.c b/utils/rspamd_http_server.c index 8e6b1dadc..a1a91f599 100644 --- a/utils/rspamd_http_server.c +++ b/utils/rspamd_http_server.c @@ -209,9 +209,7 @@ rspamd_http_start_servers (pid_t *sfd, rspamd_inet_addr_t *addr) g_assert (sfd[i] != -1); if (sfd[i] == 0) { - gperf_profiler_init (NULL, "http-server"); rspamd_http_server_func (fd, addr); - gperf_profiler_stop (); exit (EXIT_SUCCESS); } } -- 2.39.5