summaryrefslogtreecommitdiffstats
path: root/src/fuzzy_storage.c
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-07-26 10:49:23 +0100
committerVsevolod Stakhov <vsevolod@rspamd.com>2023-07-26 10:49:23 +0100
commit537a7180a0d5132c11636c4fd8b1450cd99d352c (patch)
treefb9f8c84955a411bdffbd6371ea32f2716fb3687 /src/fuzzy_storage.c
parent5fd7a90fdaa33f52c59bdb0ca84451e5c1e22365 (diff)
downloadrspamd-537a7180a0d5132c11636c4fd8b1450cd99d352c.tar.gz
rspamd-537a7180a0d5132c11636c4fd8b1450cd99d352c.zip
[Rework] Use clang-format to unify formatting in all sources
No meaningful changes.
Diffstat (limited to 'src/fuzzy_storage.c')
-rw-r--r--src/fuzzy_storage.c2164
1 files changed, 1076 insertions, 1088 deletions
diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 4bdfabee6..0110ed8c2 100644
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -54,16 +54,16 @@
static const gchar *local_db_name = "local";
/* Init functions */
-gpointer init_fuzzy (struct rspamd_config *cfg);
-void start_fuzzy (struct rspamd_worker *worker);
+gpointer init_fuzzy(struct rspamd_config *cfg);
+void start_fuzzy(struct rspamd_worker *worker);
worker_t fuzzy_worker = {
- "fuzzy", /* Name */
- init_fuzzy, /* Init function */
- start_fuzzy, /* Start function */
- RSPAMD_WORKER_HAS_SOCKET,
- RSPAMD_WORKER_SOCKET_UDP, /* UDP socket */
- RSPAMD_WORKER_VER /* Version info */
+ "fuzzy", /* Name */
+ init_fuzzy, /* Init function */
+ start_fuzzy, /* Start function */
+ RSPAMD_WORKER_HAS_SOCKET,
+ RSPAMD_WORKER_SOCKET_UDP, /* UDP socket */
+ RSPAMD_WORKER_VER /* Version info */
};
struct fuzzy_global_stat {
@@ -170,9 +170,9 @@ struct rspamd_fuzzy_storage_ctx {
gint lua_pre_handler_cbref;
gint lua_post_handler_cbref;
gint lua_blacklist_cbref;
- khash_t(fuzzy_key_ids_set) *default_forbidden_ids;
+ khash_t(fuzzy_key_ids_set) * default_forbidden_ids;
/* Ids that should not override other ids */
- khash_t(fuzzy_key_ids_set) *weak_ids;
+ khash_t(fuzzy_key_ids_set) * weak_ids;
};
enum fuzzy_cmd_type {
@@ -187,7 +187,7 @@ struct fuzzy_session {
rspamd_inet_addr_t *addr;
struct rspamd_fuzzy_storage_ctx *ctx;
- struct rspamd_fuzzy_shingle_cmd cmd; /* Can handle both shingles and non-shingles */
+ struct rspamd_fuzzy_shingle_cmd cmd; /* Can handle both shingles and non-shingles */
struct rspamd_fuzzy_encrypted_reply reply; /* Again: contains everything */
struct fuzzy_key_stat *ip_stat;
@@ -208,13 +208,13 @@ struct fuzzy_peer_request {
};
KHASH_INIT(fuzzy_key_flag_stat, int, struct fuzzy_key_stat, 1, kh_int_hash_func,
- kh_int_hash_equal);
+ kh_int_hash_equal);
struct fuzzy_key {
struct rspamd_cryptobox_keypair *key;
struct rspamd_cryptobox_pubkey *pk;
struct fuzzy_key_stat *stat;
- khash_t(fuzzy_key_flag_stat) *flags_stat;
- khash_t(fuzzy_key_ids_set) *forbidden_ids;
+ khash_t(fuzzy_key_flag_stat) * flags_stat;
+ khash_t(fuzzy_key_ids_set) * forbidden_ids;
};
struct rspamd_updates_cbdata {
@@ -225,17 +225,17 @@ struct rspamd_updates_cbdata {
};
-static void rspamd_fuzzy_write_reply (struct fuzzy_session *session);
-static gboolean rspamd_fuzzy_process_updates_queue (struct rspamd_fuzzy_storage_ctx *ctx,
- const gchar *source, gboolean final);
-static gboolean rspamd_fuzzy_check_client (struct rspamd_fuzzy_storage_ctx *ctx,
- rspamd_inet_addr_t *addr);
-static void rspamd_fuzzy_maybe_call_blacklisted (struct rspamd_fuzzy_storage_ctx *ctx,
- rspamd_inet_addr_t *addr,
- const gchar *reason);
+static void rspamd_fuzzy_write_reply(struct fuzzy_session *session);
+static gboolean rspamd_fuzzy_process_updates_queue(struct rspamd_fuzzy_storage_ctx *ctx,
+ const gchar *source, gboolean final);
+static gboolean rspamd_fuzzy_check_client(struct rspamd_fuzzy_storage_ctx *ctx,
+ rspamd_inet_addr_t *addr);
+static void rspamd_fuzzy_maybe_call_blacklisted(struct rspamd_fuzzy_storage_ctx *ctx,
+ rspamd_inet_addr_t *addr,
+ const gchar *reason);
static gboolean
-rspamd_fuzzy_check_ratelimit (struct fuzzy_session *session)
+rspamd_fuzzy_check_ratelimit(struct fuzzy_session *session)
{
rspamd_inet_addr_t *masked;
struct rspamd_leaky_bucket_elt *elt;
@@ -245,8 +245,8 @@ rspamd_fuzzy_check_ratelimit (struct fuzzy_session *session)
}
if (session->ctx->ratelimit_whitelist != NULL) {
- if (rspamd_match_radix_map_addr (session->ctx->ratelimit_whitelist,
- session->addr) != NULL) {
+ if (rspamd_match_radix_map_addr(session->ctx->ratelimit_whitelist,
+ session->addr) != NULL) {
return TRUE;
}
}
@@ -259,23 +259,23 @@ rspamd_fuzzy_check_ratelimit (struct fuzzy_session *session)
masked = rspamd_inet_address_copy(session->addr, NULL);
- if (rspamd_inet_address_get_af (masked) == AF_INET) {
- rspamd_inet_address_apply_mask (masked,
- MIN (session->ctx->leaky_bucket_mask, 32));
+ if (rspamd_inet_address_get_af(masked) == AF_INET) {
+ rspamd_inet_address_apply_mask(masked,
+ MIN(session->ctx->leaky_bucket_mask, 32));
}
else {
/* Must be at least /64 */
- rspamd_inet_address_apply_mask (masked,
- MIN (MAX (session->ctx->leaky_bucket_mask * 4, 64), 128));
+ rspamd_inet_address_apply_mask(masked,
+ MIN(MAX(session->ctx->leaky_bucket_mask * 4, 64), 128));
}
- elt = rspamd_lru_hash_lookup (session->ctx->ratelimit_buckets, masked,
- (time_t)session->timestamp);
+ elt = rspamd_lru_hash_lookup(session->ctx->ratelimit_buckets, masked,
+ (time_t) session->timestamp);
if (elt) {
gboolean ratelimited = FALSE, new_ratelimit = FALSE;
- if (isnan (elt->cur)) {
+ if (isnan(elt->cur)) {
/* There is an issue with the previous logic: the TTL is updated each time
* we see that new bucket. Hence, we need to check the `last` and act accordingly
*/
@@ -308,16 +308,16 @@ rspamd_fuzzy_check_ratelimit (struct fuzzy_session *session)
/* Check the bucket */
if (elt->cur >= session->ctx->leaky_bucket_burst) {
- msg_info ("ratelimiting %s (%s), %.1f max elts",
- rspamd_inet_address_to_string (session->addr),
- rspamd_inet_address_to_string (masked),
- session->ctx->leaky_bucket_burst);
+ msg_info("ratelimiting %s (%s), %.1f max elts",
+ rspamd_inet_address_to_string(session->addr),
+ rspamd_inet_address_to_string(masked),
+ session->ctx->leaky_bucket_burst);
elt->cur = NAN;
new_ratelimit = TRUE;
ratelimited = TRUE;
}
else {
- elt->cur ++; /* Allow one more request */
+ elt->cur++; /* Allow one more request */
}
}
@@ -341,67 +341,68 @@ rspamd_fuzzy_check_ratelimit (struct fuzzy_session *session)
rspamd_srv_send_command(session->worker, session->ctx->event_loop, &srv_cmd, -1, NULL, NULL);
}
else {
- msg_err("bad address length: %d, expected to be %d", (int)slen, (int)sizeof(srv_cmd.cmd.fuzzy_blocked.addr));
+ msg_err("bad address length: %d, expected to be %d", (int) slen, (int) sizeof(srv_cmd.cmd.fuzzy_blocked.addr));
}
}
}
- rspamd_inet_address_free (masked);
+ rspamd_inet_address_free(masked);
return !ratelimited;
}
else {
/* New bucket */
- elt = g_malloc (sizeof (*elt));
+ elt = g_malloc(sizeof(*elt));
elt->addr = masked; /* transfer ownership */
elt->cur = 1;
elt->last = session->timestamp;
- rspamd_lru_hash_insert (session->ctx->ratelimit_buckets,
- masked,
- elt,
- session->timestamp,
- session->ctx->leaky_bucket_ttl);
+ rspamd_lru_hash_insert(session->ctx->ratelimit_buckets,
+ masked,
+ elt,
+ session->timestamp,
+ session->ctx->leaky_bucket_ttl);
}
return TRUE;
}
static void
-rspamd_fuzzy_maybe_call_blacklisted (struct rspamd_fuzzy_storage_ctx *ctx,
- rspamd_inet_addr_t *addr,
- const gchar *reason)
+rspamd_fuzzy_maybe_call_blacklisted(struct rspamd_fuzzy_storage_ctx *ctx,
+ rspamd_inet_addr_t *addr,
+ const gchar *reason)
{
if (ctx->lua_blacklist_cbref != -1) {
lua_State *L = ctx->cfg->lua_state;
gint err_idx, ret;
- lua_pushcfunction (L, &rspamd_lua_traceback);
- err_idx = lua_gettop (L);
- lua_rawgeti (L, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
+ lua_pushcfunction(L, &rspamd_lua_traceback);
+ err_idx = lua_gettop(L);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
/* client IP */
- rspamd_lua_ip_push (L, addr);
+ rspamd_lua_ip_push(L, addr);
/* block reason */
- lua_pushstring (L, reason);
+ lua_pushstring(L, reason);
- if ((ret = lua_pcall (L, 2, 0, err_idx)) != 0) {
- msg_err ("call to lua_blacklist_cbref "
- "script failed (%d): %s", ret, lua_tostring (L, -1));
+ if ((ret = lua_pcall(L, 2, 0, err_idx)) != 0) {
+ msg_err("call to lua_blacklist_cbref "
+ "script failed (%d): %s",
+ ret, lua_tostring(L, -1));
}
- lua_settop (L, 0);
+ lua_settop(L, 0);
}
}
static gboolean
-rspamd_fuzzy_check_client (struct rspamd_fuzzy_storage_ctx *ctx,
- rspamd_inet_addr_t *addr)
+rspamd_fuzzy_check_client(struct rspamd_fuzzy_storage_ctx *ctx,
+ rspamd_inet_addr_t *addr)
{
if (ctx->blocked_ips != NULL) {
- if (rspamd_match_radix_map_addr (ctx->blocked_ips,
- addr) != NULL) {
+ if (rspamd_match_radix_map_addr(ctx->blocked_ips,
+ addr) != NULL) {
- rspamd_fuzzy_maybe_call_blacklisted (ctx, addr, "blacklisted");
+ rspamd_fuzzy_maybe_call_blacklisted(ctx, addr, "blacklisted");
return FALSE;
}
}
@@ -410,18 +411,18 @@ rspamd_fuzzy_check_client (struct rspamd_fuzzy_storage_ctx *ctx,
}
static gboolean
-rspamd_fuzzy_check_write (struct fuzzy_session *session)
+rspamd_fuzzy_check_write(struct fuzzy_session *session)
{
if (session->ctx->read_only) {
return FALSE;
}
if (session->ctx->update_ips != NULL && session->addr) {
- if (rspamd_inet_address_get_af (session->addr) == AF_UNIX) {
+ if (rspamd_inet_address_get_af(session->addr) == AF_UNIX) {
return TRUE;
}
- if (rspamd_match_radix_map_addr (session->ctx->update_ips,
- session->addr) == NULL) {
+ if (rspamd_match_radix_map_addr(session->ctx->update_ips,
+ session->addr) == NULL) {
return FALSE;
}
else {
@@ -433,12 +434,12 @@ rspamd_fuzzy_check_write (struct fuzzy_session *session)
static gchar base32_buf[rspamd_cryptobox_HASHBYTES * 2 + 1];
guint raw_len;
const guchar *pk_raw = rspamd_keypair_component(session->key->key,
- RSPAMD_KEYPAIR_COMPONENT_ID, &raw_len);
+ RSPAMD_KEYPAIR_COMPONENT_ID, &raw_len);
gint encoded_len = rspamd_encode_base32_buf(pk_raw, raw_len,
- base32_buf,sizeof(base32_buf),
- RSPAMD_BASE32_DEFAULT);
+ base32_buf, sizeof(base32_buf),
+ RSPAMD_BASE32_DEFAULT);
- if (rspamd_match_hash_map (session->ctx->update_keys, base32_buf, encoded_len)) {
+ if (rspamd_match_hash_map(session->ctx->update_keys, base32_buf, encoded_len)) {
return TRUE;
}
}
@@ -447,37 +448,37 @@ rspamd_fuzzy_check_write (struct fuzzy_session *session)
}
static void
-fuzzy_key_stat_dtor (gpointer p)
+fuzzy_key_stat_dtor(gpointer p)
{
struct fuzzy_key_stat *st = p;
if (st->last_ips) {
- rspamd_lru_hash_destroy (st->last_ips);
+ rspamd_lru_hash_destroy(st->last_ips);
}
if (st->keypair) {
rspamd_keypair_unref(st->keypair);
}
- g_free (st);
+ g_free(st);
}
static void
-fuzzy_key_stat_unref (gpointer p)
+fuzzy_key_stat_unref(gpointer p)
{
struct fuzzy_key_stat *st = p;
- REF_RELEASE (st);
+ REF_RELEASE(st);
}
static void
-fuzzy_key_dtor (gpointer p)
+fuzzy_key_dtor(gpointer p)
{
struct fuzzy_key *key = p;
if (key) {
if (key->stat) {
- REF_RELEASE (key->stat);
+ REF_RELEASE(key->stat);
}
if (key->flags_stat) {
@@ -488,12 +489,12 @@ fuzzy_key_dtor (gpointer p)
kh_destroy(fuzzy_key_ids_set, key->forbidden_ids);
}
- g_free (key);
+ g_free(key);
}
}
static void
-fuzzy_count_callback (guint64 count, void *ud)
+fuzzy_count_callback(guint64 count, void *ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
@@ -501,44 +502,44 @@ fuzzy_count_callback (guint64 count, void *ud)
}
static void
-fuzzy_rl_bucket_free (gpointer p)
+fuzzy_rl_bucket_free(gpointer p)
{
- struct rspamd_leaky_bucket_elt *elt = (struct rspamd_leaky_bucket_elt *)p;
+ struct rspamd_leaky_bucket_elt *elt = (struct rspamd_leaky_bucket_elt *) p;
- rspamd_inet_address_free (elt->addr);
- g_free (elt);
+ rspamd_inet_address_free(elt->addr);
+ g_free(elt);
}
static void
-fuzzy_stat_count_callback (guint64 count, void *ud)
+fuzzy_stat_count_callback(guint64 count, void *ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
- ev_timer_again (ctx->event_loop, &ctx->stat_ev);
+ ev_timer_again(ctx->event_loop, &ctx->stat_ev);
ctx->stat.fuzzy_hashes = count;
}
static void
-rspamd_fuzzy_stat_callback (EV_P_ ev_timer *w, int revents)
+rspamd_fuzzy_stat_callback(EV_P_ ev_timer *w, int revents)
{
struct rspamd_fuzzy_storage_ctx *ctx =
- (struct rspamd_fuzzy_storage_ctx *)w->data;
- rspamd_fuzzy_backend_count (ctx->backend, fuzzy_stat_count_callback, ctx);
+ (struct rspamd_fuzzy_storage_ctx *) w->data;
+ rspamd_fuzzy_backend_count(ctx->backend, fuzzy_stat_count_callback, ctx);
}
static void
-fuzzy_update_version_callback (guint64 ver, void *ud)
+fuzzy_update_version_callback(guint64 ver, void *ud)
{
}
static void
-rspamd_fuzzy_updates_cb (gboolean success,
- guint nadded,
- guint ndeleted,
- guint nextended,
- guint nignored,
- void *ud)
+rspamd_fuzzy_updates_cb(gboolean success,
+ guint nadded,
+ guint ndeleted,
+ guint nextended,
+ guint nignored,
+ void *ud)
{
struct rspamd_updates_cbdata *cbdata = ud;
struct rspamd_fuzzy_storage_ctx *ctx;
@@ -550,17 +551,15 @@ rspamd_fuzzy_updates_cb (gboolean success,
if (success) {
rspamd_fuzzy_backend_count(ctx->backend, fuzzy_count_callback, ctx);
- msg_info ("successfully updated fuzzy storage %s: %d updates in queue; "
- "%d pending currently; "
- "%d added; %d deleted; %d extended; %d duplicates",
- ctx->worker->cf->bind_conf ?
- ctx->worker->cf->bind_conf->bind_line :
- "unknown",
- cbdata->updates_pending->len,
- ctx->updates_pending->len,
- nadded, ndeleted, nextended, nignored);
+ msg_info("successfully updated fuzzy storage %s: %d updates in queue; "
+ "%d pending currently; "
+ "%d added; %d deleted; %d extended; %d duplicates",
+ ctx->worker->cf->bind_conf ? ctx->worker->cf->bind_conf->bind_line : "unknown",
+ cbdata->updates_pending->len,
+ ctx->updates_pending->len,
+ nadded, ndeleted, nextended, nignored);
rspamd_fuzzy_backend_version(ctx->backend, source,
- fuzzy_update_version_callback, NULL);
+ fuzzy_update_version_callback, NULL);
ctx->updates_failed = 0;
if (cbdata->final || ctx->worker->state != rspamd_worker_state_running) {
@@ -570,11 +569,9 @@ rspamd_fuzzy_updates_cb (gboolean success,
}
else {
if (++ctx->updates_failed > ctx->updates_maxfail) {
- msg_err ("cannot commit update transaction to fuzzy backend %s, discard "
- "%ud updates after %d retries",
- ctx->worker->cf->bind_conf ?
- ctx->worker->cf->bind_conf->bind_line :
- "unknown",
+ msg_err("cannot commit update transaction to fuzzy backend %s, discard "
+ "%ud updates after %d retries",
+ ctx->worker->cf->bind_conf ? ctx->worker->cf->bind_conf->bind_line : "unknown",
cbdata->updates_pending->len,
ctx->updates_maxfail);
ctx->updates_failed = 0;
@@ -586,124 +583,122 @@ rspamd_fuzzy_updates_cb (gboolean success,
}
else {
if (ctx->updates_pending) {
- msg_err ("cannot commit update transaction to fuzzy backend %s; "
- "%ud updates are still left; %ud currently pending;"
- " %d retries remaining",
- ctx->worker->cf->bind_conf ?
- ctx->worker->cf->bind_conf->bind_line : "unknown",
+ msg_err("cannot commit update transaction to fuzzy backend %s; "
+ "%ud updates are still left; %ud currently pending;"
+ " %d retries remaining",
+ ctx->worker->cf->bind_conf ? ctx->worker->cf->bind_conf->bind_line : "unknown",
cbdata->updates_pending->len,
ctx->updates_pending->len,
ctx->updates_maxfail - ctx->updates_failed);
/* Move the remaining updates to ctx queue */
g_array_append_vals(ctx->updates_pending,
- cbdata->updates_pending->data,
- cbdata->updates_pending->len);
+ cbdata->updates_pending->data,
+ cbdata->updates_pending->len);
if (cbdata->final) {
/* Try one more time */
rspamd_fuzzy_process_updates_queue(cbdata->ctx, cbdata->source,
- cbdata->final);
+ cbdata->final);
}
}
else {
/* We have lost our ctx, so it is a race condition case */
- msg_err ("cannot commit update transaction to fuzzy backend %s; "
- "%ud updates are still left; no more retries: a worker is terminated",
- ctx->worker->cf->bind_conf ?
- ctx->worker->cf->bind_conf->bind_line : "unknown",
+ msg_err("cannot commit update transaction to fuzzy backend %s; "
+ "%ud updates are still left; no more retries: a worker is terminated",
+ ctx->worker->cf->bind_conf ? ctx->worker->cf->bind_conf->bind_line : "unknown",
cbdata->updates_pending->len);
}
}
}
- g_array_free (cbdata->updates_pending, TRUE);
- g_free (cbdata->source);
- g_free (cbdata);
+ g_array_free(cbdata->updates_pending, TRUE);
+ g_free(cbdata->source);
+ g_free(cbdata);
}
static gboolean
-rspamd_fuzzy_process_updates_queue (struct rspamd_fuzzy_storage_ctx *ctx,
- const gchar *source, gboolean final)
+rspamd_fuzzy_process_updates_queue(struct rspamd_fuzzy_storage_ctx *ctx,
+ const gchar *source, gboolean final)
{
struct rspamd_updates_cbdata *cbdata;
if (ctx->updates_pending->len > 0) {
- cbdata = g_malloc (sizeof (*cbdata));
+ cbdata = g_malloc(sizeof(*cbdata));
cbdata->ctx = ctx;
cbdata->final = final;
cbdata->updates_pending = ctx->updates_pending;
- ctx->updates_pending = g_array_sized_new (FALSE, FALSE,
- sizeof (struct fuzzy_peer_cmd),
- MAX (cbdata->updates_pending->len, 1024));
- cbdata->source = g_strdup (source);
- rspamd_fuzzy_backend_process_updates (ctx->backend,
- cbdata->updates_pending,
- source, rspamd_fuzzy_updates_cb, cbdata);
+ ctx->updates_pending = g_array_sized_new(FALSE, FALSE,
+ sizeof(struct fuzzy_peer_cmd),
+ MAX(cbdata->updates_pending->len, 1024));
+ cbdata->source = g_strdup(source);
+ rspamd_fuzzy_backend_process_updates(ctx->backend,
+ cbdata->updates_pending,
+ source, rspamd_fuzzy_updates_cb, cbdata);
return TRUE;
}
else if (final) {
/* No need to sync */
- ev_break (ctx->event_loop, EVBREAK_ALL);
+ ev_break(ctx->event_loop, EVBREAK_ALL);
}
return FALSE;
}
static void
-rspamd_fuzzy_reply_io (EV_P_ ev_io *w, int revents)
+rspamd_fuzzy_reply_io(EV_P_ ev_io *w, int revents)
{
- struct fuzzy_session *session = (struct fuzzy_session *)w->data;
+ struct fuzzy_session *session = (struct fuzzy_session *) w->data;
- ev_io_stop (EV_A_ w);
- rspamd_fuzzy_write_reply (session);
- REF_RELEASE (session);
+ ev_io_stop(EV_A_ w);
+ rspamd_fuzzy_write_reply(session);
+ REF_RELEASE(session);
}
static void
-rspamd_fuzzy_write_reply (struct fuzzy_session *session)
+rspamd_fuzzy_write_reply(struct fuzzy_session *session)
{
gssize r;
gsize len;
gconstpointer data;
if (session->cmd_type == CMD_ENCRYPTED_NORMAL ||
- session->cmd_type == CMD_ENCRYPTED_SHINGLE) {
+ session->cmd_type == CMD_ENCRYPTED_SHINGLE) {
/* Encrypted reply */
data = &session->reply;
if (session->epoch > RSPAMD_FUZZY_EPOCH10) {
- len = sizeof (session->reply);
+ len = sizeof(session->reply);
}
else {
- len = sizeof (session->reply.hdr) + sizeof (session->reply.rep.v1);
+ len = sizeof(session->reply.hdr) + sizeof(session->reply.rep.v1);
}
}
else {
data = &session->reply.rep;
if (session->epoch > RSPAMD_FUZZY_EPOCH10) {
- len = sizeof (session->reply.rep);
+ len = sizeof(session->reply.rep);
}
else {
- len = sizeof (session->reply.rep.v1);
+ len = sizeof(session->reply.rep.v1);
}
}
- r = rspamd_inet_address_sendto (session->fd, data, len, 0,
- session->addr);
+ r = rspamd_inet_address_sendto(session->fd, data, len, 0,
+ session->addr);
if (r == -1) {
if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) {
/* Grab reference to avoid early destruction */
- REF_RETAIN (session);
+ REF_RETAIN(session);
session->io.data = session;
- ev_io_init (&session->io,
- rspamd_fuzzy_reply_io, session->fd, EV_WRITE);
- ev_io_start (session->ctx->event_loop, &session->io);
+ ev_io_init(&session->io,
+ rspamd_fuzzy_reply_io, session->fd, EV_WRITE);
+ ev_io_start(session->ctx->event_loop, &session->io);
}
else {
- msg_err ("error while writing reply: %s", strerror (errno));
+ msg_err("error while writing reply: %s", strerror(errno));
}
}
}
@@ -716,14 +711,14 @@ rspamd_fuzzy_update_key_stat(gboolean matched,
ev_tstamp timestamp)
{
if (!matched && res->v1.value != 0) {
- key_stat->errors ++;
+ key_stat->errors++;
}
else {
if (cmd == FUZZY_CHECK) {
key_stat->checked++;
if (matched) {
- key_stat->matched ++;
+ key_stat->matched++;
}
if (G_UNLIKELY(key_stat->last_checked_time == 0.0)) {
@@ -735,8 +730,8 @@ rspamd_fuzzy_update_key_stat(gboolean matched,
guint64 nchecked = key_stat->checked - key_stat->last_checked_count;
guint64 nmatched = key_stat->matched - key_stat->last_matched_count;
- rspamd_set_counter_ema (&key_stat->checked_ctr, nchecked, 0.5f);
- rspamd_set_counter_ema (&key_stat->matched_ctr, nmatched, 0.5f);
+ rspamd_set_counter_ema(&key_stat->checked_ctr, nchecked, 0.5f);
+ rspamd_set_counter_ema(&key_stat->matched_ctr, nmatched, 0.5f);
key_stat->last_checked_time = timestamp;
key_stat->last_checked_count = key_stat->checked;
key_stat->last_matched_count = key_stat->matched;
@@ -752,18 +747,18 @@ rspamd_fuzzy_update_key_stat(gboolean matched,
}
static void
-rspamd_fuzzy_update_stats (struct rspamd_fuzzy_storage_ctx *ctx,
- enum rspamd_fuzzy_epoch epoch,
- gboolean matched,
- gboolean is_shingle,
- gboolean is_delayed,
- struct fuzzy_key *key,
- struct fuzzy_key_stat *ip_stat,
- guint cmd,
- struct rspamd_fuzzy_reply *res,
- ev_tstamp timestamp)
+rspamd_fuzzy_update_stats(struct rspamd_fuzzy_storage_ctx *ctx,
+ enum rspamd_fuzzy_epoch epoch,
+ gboolean matched,
+ gboolean is_shingle,
+ gboolean is_delayed,
+ struct fuzzy_key *key,
+ struct fuzzy_key_stat *ip_stat,
+ guint cmd,
+ struct rspamd_fuzzy_reply *res,
+ ev_tstamp timestamp)
{
- ctx->stat.fuzzy_hashes_checked[epoch] ++;
+ ctx->stat.fuzzy_hashes_checked[epoch]++;
if (matched) {
ctx->stat.fuzzy_hashes_found[epoch]++;
@@ -772,7 +767,7 @@ rspamd_fuzzy_update_stats (struct rspamd_fuzzy_storage_ctx *ctx,
ctx->stat.fuzzy_shingles_checked[epoch]++;
}
if (is_delayed) {
- ctx->stat.delayed_hashes ++;
+ ctx->stat.delayed_hashes++;
}
if (key) {
@@ -825,16 +820,16 @@ enum rspamd_fuzzy_reply_flags {
};
static void
-rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
- struct rspamd_fuzzy_reply *result,
- struct fuzzy_session *session,
- gint flags)
+rspamd_fuzzy_make_reply(struct rspamd_fuzzy_cmd *cmd,
+ struct rspamd_fuzzy_reply *result,
+ struct fuzzy_session *session,
+ gint flags)
{
gsize len;
if (cmd) {
result->v1.tag = cmd->tag;
- memcpy (&session->reply.rep, result, sizeof (*result));
+ memcpy(&session->reply.rep, result, sizeof(*result));
if (flags & RSPAMD_FUZZY_REPLY_DELAY) {
/* Hash is too fresh, need to delay it */
@@ -863,7 +858,7 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
k = kh_get(fuzzy_key_ids_set, session->key->forbidden_ids, session->reply.rep.v1.flag);
- if (k != kh_end (session->key->forbidden_ids)) {
+ if (k != kh_end(session->key->forbidden_ids)) {
/* Hash is from a forbidden flag for this key */
session->reply.rep.ts = 0;
session->reply.rep.v1.prob = 0.0f;
@@ -880,8 +875,8 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
}
/* We need also to encrypt reply */
- ottery_rand_bytes (session->reply.hdr.nonce,
- sizeof (session->reply.hdr.nonce));
+ ottery_rand_bytes(session->reply.hdr.nonce,
+ sizeof(session->reply.hdr.nonce));
/*
* For old replies we need to encrypt just old part, otherwise
@@ -889,32 +884,32 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
*/
if (session->epoch > RSPAMD_FUZZY_EPOCH10) {
- len = sizeof (session->reply.rep);
+ len = sizeof(session->reply.rep);
}
else {
- len = sizeof (session->reply.rep.v1);
+ len = sizeof(session->reply.rep.v1);
}
/* Update stats before encryption */
if (cmd->cmd != FUZZY_STAT && cmd->cmd <= FUZZY_CLIENT_MAX) {
rspamd_fuzzy_update_stats(session->ctx,
- session->epoch,
- session->reply.rep.v1.prob > 0.5f,
- flags & RSPAMD_FUZZY_REPLY_SHINGLE,
- flags & RSPAMD_FUZZY_REPLY_DELAY,
- session->key,
- session->ip_stat,
- cmd->cmd,
- &session->reply.rep,
- session->timestamp);
- }
-
- rspamd_cryptobox_encrypt_nm_inplace ((guchar *)&session->reply.rep,
- len,
- session->reply.hdr.nonce,
- session->nm,
- session->reply.hdr.mac,
- RSPAMD_CRYPTOBOX_MODE_25519);
+ session->epoch,
+ session->reply.rep.v1.prob > 0.5f,
+ flags & RSPAMD_FUZZY_REPLY_SHINGLE,
+ flags & RSPAMD_FUZZY_REPLY_DELAY,
+ session->key,
+ session->ip_stat,
+ cmd->cmd,
+ &session->reply.rep,
+ session->timestamp);
+ }
+
+ rspamd_cryptobox_encrypt_nm_inplace((guchar *) &session->reply.rep,
+ len,
+ session->reply.hdr.nonce,
+ session->nm,
+ session->reply.hdr.mac,
+ RSPAMD_CRYPTOBOX_MODE_25519);
}
else if (default_disabled) {
/* Hash is from a forbidden flag by default, and there is no encryption override */
@@ -926,30 +921,30 @@ rspamd_fuzzy_make_reply (struct rspamd_fuzzy_cmd *cmd,
if (!(flags & RSPAMD_FUZZY_REPLY_ENCRYPTED)) {
if (cmd->cmd != FUZZY_STAT && cmd->cmd <= FUZZY_CLIENT_MAX) {
rspamd_fuzzy_update_stats(session->ctx,
- session->epoch,
- session->reply.rep.v1.prob > 0.5f,
- flags & RSPAMD_FUZZY_REPLY_SHINGLE,
- flags & RSPAMD_FUZZY_REPLY_DELAY,
- session->key,
- session->ip_stat,
- cmd->cmd,
- &session->reply.rep,
- session->timestamp);
+ session->epoch,
+ session->reply.rep.v1.prob > 0.5f,
+ flags & RSPAMD_FUZZY_REPLY_SHINGLE,
+ flags & RSPAMD_FUZZY_REPLY_DELAY,
+ session->key,
+ session->ip_stat,
+ cmd->cmd,
+ &session->reply.rep,
+ session->timestamp);
}
}
}
- rspamd_fuzzy_write_reply (session);
+ rspamd_fuzzy_write_reply(session);
}
static gboolean
-fuzzy_peer_try_send (gint fd, struct fuzzy_peer_request *up_req)
+fuzzy_peer_try_send(gint fd, struct fuzzy_peer_request *up_req)
{
gssize r;
- r = write (fd, &up_req->cmd, sizeof (up_req->cmd));
+ r = write(fd, &up_req->cmd, sizeof(up_req->cmd));
- if (r != sizeof (up_req->cmd)) {
+ if (r != sizeof(up_req->cmd)) {
return FALSE;
}
@@ -957,54 +952,55 @@ fuzzy_peer_try_send (gint fd, struct fuzzy_peer_request *up_req)
}
static void
-fuzzy_peer_send_io (EV_P_ ev_io *w, int revents)
+fuzzy_peer_send_io(EV_P_ ev_io *w, int revents)
{
- struct fuzzy_peer_request *up_req = (struct fuzzy_peer_request *)w->data;
+ struct fuzzy_peer_request *up_req = (struct fuzzy_peer_request *) w->data;
- if (!fuzzy_peer_try_send (w->fd, up_req)) {
- msg_err ("cannot send update request to the peer: %s", strerror (errno));
+ if (!fuzzy_peer_try_send(w->fd, up_req)) {
+ msg_err("cannot send update request to the peer: %s", strerror(errno));
}
- ev_io_stop (EV_A_ w);
- g_free (up_req);
+ ev_io_stop(EV_A_ w);
+ g_free(up_req);
}
static void
-rspamd_fuzzy_extensions_tolua (lua_State *L,
- struct fuzzy_session *session)
+rspamd_fuzzy_extensions_tolua(lua_State *L,
+ struct fuzzy_session *session)
{
struct rspamd_fuzzy_cmd_extension *ext;
rspamd_inet_addr_t *addr;
- lua_createtable (L, 0, 0);
+ lua_createtable(L, 0, 0);
- LL_FOREACH (session->extensions, ext) {
+ LL_FOREACH(session->extensions, ext)
+ {
switch (ext->ext) {
case RSPAMD_FUZZY_EXT_SOURCE_DOMAIN:
- lua_pushlstring (L, ext->payload, ext->length);
- lua_setfield (L, -2, "domain");
+ lua_pushlstring(L, ext->payload, ext->length);
+ lua_setfield(L, -2, "domain");
break;
case RSPAMD_FUZZY_EXT_SOURCE_IP4:
- addr = rspamd_inet_address_new (AF_INET, ext->payload);
- rspamd_lua_ip_push (L, addr);
- rspamd_inet_address_free (addr);
- lua_setfield (L, -2, "ip");
+ addr = rspamd_inet_address_new(AF_INET, ext->payload);
+ rspamd_lua_ip_push(L, addr);
+ rspamd_inet_address_free(addr);
+ lua_setfield(L, -2, "ip");
break;
case RSPAMD_FUZZY_EXT_SOURCE_IP6:
- addr = rspamd_inet_address_new (AF_INET6, ext->payload);
- rspamd_lua_ip_push (L, addr);
- rspamd_inet_address_free (addr);
- lua_setfield (L, -2, "ip");
+ addr = rspamd_inet_address_new(AF_INET6, ext->payload);
+ rspamd_lua_ip_push(L, addr);
+ rspamd_inet_address_free(addr);
+ lua_setfield(L, -2, "ip");
break;
}
}
}
static void
-rspamd_fuzzy_check_callback (struct rspamd_fuzzy_reply *result, void *ud)
+rspamd_fuzzy_check_callback(struct rspamd_fuzzy_reply *result, void *ud)
{
struct fuzzy_session *session = ud;
- gboolean is_shingle = FALSE, __attribute__ ((unused)) encrypted = FALSE;
+ gboolean is_shingle = FALSE, __attribute__((unused)) encrypted = FALSE;
struct rspamd_fuzzy_cmd *cmd = NULL;
const struct rspamd_shingle *shingle = NULL;
struct rspamd_shingle sgl_cpy;
@@ -1025,7 +1021,7 @@ rspamd_fuzzy_check_callback (struct rspamd_fuzzy_reply *result, void *ud)
/* Fallthrough */
case CMD_SHINGLE:
cmd = &session->cmd.basic;
- memcpy (&sgl_cpy, &session->cmd.sgl, sizeof (sgl_cpy));
+ memcpy(&sgl_cpy, &session->cmd.sgl, sizeof(sgl_cpy));
shingle = &sgl_cpy;
is_shingle = TRUE;
send_flags |= RSPAMD_FUZZY_REPLY_SHINGLE;
@@ -1037,39 +1033,40 @@ rspamd_fuzzy_check_callback (struct rspamd_fuzzy_reply *result, void *ud)
lua_State *L = session->ctx->cfg->lua_state;
gint err_idx, ret;
- lua_pushcfunction (L, &rspamd_lua_traceback);
- err_idx = lua_gettop (L);
+ lua_pushcfunction(L, &rspamd_lua_traceback);
+ err_idx = lua_gettop(L);
/* Preallocate stack (small opt) */
- lua_checkstack (L, err_idx + 9);
+ lua_checkstack(L, err_idx + 9);
/* function */
- lua_rawgeti (L, LUA_REGISTRYINDEX, session->ctx->lua_post_handler_cbref);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, session->ctx->lua_post_handler_cbref);
/* client IP */
if (session->addr) {
rspamd_lua_ip_push(L, session->addr);
}
else {
- lua_pushnil (L);
+ lua_pushnil(L);
}
/* client command */
- lua_pushinteger (L, cmd->cmd);
+ lua_pushinteger(L, cmd->cmd);
/* command value (push as rspamd_text) */
- (void)lua_new_text (L, result->digest, sizeof (result->digest), FALSE);
+ (void) lua_new_text(L, result->digest, sizeof(result->digest), FALSE);
/* is shingle */
- lua_pushboolean (L, is_shingle);
+ lua_pushboolean(L, is_shingle);
/* result value */
- lua_pushinteger (L, result->v1.value);
+ lua_pushinteger(L, result->v1.value);
/* result probability */
- lua_pushnumber (L, result->v1.prob);
+ lua_pushnumber(L, result->v1.prob);
/* result flag */
- lua_pushinteger (L, result->v1.flag);
+ lua_pushinteger(L, result->v1.flag);
/* result timestamp */
- lua_pushinteger (L, result->ts);
+ lua_pushinteger(L, result->ts);
/* TODO: add additional data maybe (encryption, pubkey, etc) */
- rspamd_fuzzy_extensions_tolua (L, session);
+ rspamd_fuzzy_extensions_tolua(L, session);
- if ((ret = lua_pcall (L, 9, LUA_MULTRET, err_idx)) != 0) {
- msg_err ("call to lua_post_handler lua "
- "script failed (%d): %s", ret, lua_tostring (L, -1));
+ if ((ret = lua_pcall(L, 9, LUA_MULTRET, err_idx)) != 0) {
+ msg_err("call to lua_post_handler lua "
+ "script failed (%d): %s",
+ ret, lua_tostring(L, -1));
}
else {
/* Return values order:
@@ -1079,40 +1076,40 @@ rspamd_fuzzy_check_callback (struct rspamd_fuzzy_reply *result, void *ud)
* 3-rd will be probability (or 0.0 if missing)
* 4-th value is flag (or default flag if missing)
*/
- ret = lua_toboolean (L, err_idx + 1);
+ ret = lua_toboolean(L, err_idx + 1);
if (ret) {
/* Artificial reply */
- result->v1.value = lua_tointeger (L, err_idx + 2);
+ result->v1.value = lua_tointeger(L, err_idx + 2);
- if (lua_isnumber (L, err_idx + 3)) {
- result->v1.prob = lua_tonumber (L, err_idx + 3);
+ if (lua_isnumber(L, err_idx + 3)) {
+ result->v1.prob = lua_tonumber(L, err_idx + 3);
}
else {
result->v1.prob = 0.0f;
}
- if (lua_isnumber (L, err_idx + 4)) {
- result->v1.flag = lua_tointeger (L, err_idx + 4);
+ if (lua_isnumber(L, err_idx + 4)) {
+ result->v1.flag = lua_tointeger(L, err_idx + 4);
}
- lua_settop (L, 0);
- rspamd_fuzzy_make_reply (cmd, result, session, send_flags);
- REF_RELEASE (session);
+ lua_settop(L, 0);
+ rspamd_fuzzy_make_reply(cmd, result, session, send_flags);
+ REF_RELEASE(session);
return;
}
}
- lua_settop (L, 0);
+ lua_settop(L, 0);
}
- if (!isnan (session->ctx->delay) &&
- rspamd_match_radix_map_addr (session->ctx->delay_whitelist,
- session->addr) == NULL) {
- gdouble hash_age = rspamd_get_calendar_ticks () - result->ts;
- gdouble jittered_age = rspamd_time_jitter (session->ctx->delay,
- session->ctx->delay / 2.0);
+ if (!isnan(session->ctx->delay) &&
+ rspamd_match_radix_map_addr(session->ctx->delay_whitelist,
+ session->addr) == NULL) {
+ gdouble hash_age = rspamd_get_calendar_ticks() - result->ts;
+ gdouble jittered_age = rspamd_time_jitter(session->ctx->delay,
+ session->ctx->delay / 2.0);
if (hash_age < jittered_age) {
send_flags |= RSPAMD_FUZZY_REPLY_DELAY;
@@ -1126,58 +1123,58 @@ rspamd_fuzzy_check_callback (struct rspamd_fuzzy_reply *result, void *ud)
if (session->worker->index == 0) {
/* Just add to the queue */
- memset (&up_cmd, 0, sizeof (up_cmd));
+ memset(&up_cmd, 0, sizeof(up_cmd));
up_cmd.is_shingle = is_shingle;
- memcpy (up_cmd.cmd.normal.digest, result->digest,
- sizeof (up_cmd.cmd.normal.digest));
+ memcpy(up_cmd.cmd.normal.digest, result->digest,
+ sizeof(up_cmd.cmd.normal.digest));
up_cmd.cmd.normal.flag = result->v1.flag;
up_cmd.cmd.normal.cmd = FUZZY_REFRESH;
up_cmd.cmd.normal.shingles_count = cmd->shingles_count;
if (is_shingle && shingle) {
- memcpy (&up_cmd.cmd.shingle.sgl, shingle,
- sizeof (up_cmd.cmd.shingle.sgl));
+ memcpy(&up_cmd.cmd.shingle.sgl, shingle,
+ sizeof(up_cmd.cmd.shingle.sgl));
}
- g_array_append_val (session->ctx->updates_pending, up_cmd);
+ g_array_append_val(session->ctx->updates_pending, up_cmd);
}
else {
/* We need to send request to the peer */
- up_req = g_malloc0 (sizeof (*up_req));
+ up_req = g_malloc0(sizeof(*up_req));
up_req->cmd.is_shingle = is_shingle;
- memcpy (up_req->cmd.cmd.normal.digest, result->digest,
- sizeof (up_req->cmd.cmd.normal.digest));
+ memcpy(up_req->cmd.cmd.normal.digest, result->digest,
+ sizeof(up_req->cmd.cmd.normal.digest));
up_req->cmd.cmd.normal.flag = result->v1.flag;
up_req->cmd.cmd.normal.cmd = FUZZY_REFRESH;
up_req->cmd.cmd.normal.shingles_count = cmd->shingles_count;
if (is_shingle && shingle) {
- memcpy (&up_req->cmd.cmd.shingle.sgl, shingle,
- sizeof (up_req->cmd.cmd.shingle.sgl));
+ memcpy(&up_req->cmd.cmd.shingle.sgl, shingle,
+ sizeof(up_req->cmd.cmd.shingle.sgl));
}
- if (!fuzzy_peer_try_send (session->ctx->peer_fd, up_req)) {
+ if (!fuzzy_peer_try_send(session->ctx->peer_fd, up_req)) {
up_req->io_ev.data = up_req;
- ev_io_init (&up_req->io_ev, fuzzy_peer_send_io,
- session->ctx->peer_fd, EV_WRITE);
- ev_io_start (session->ctx->event_loop, &up_req->io_ev);
+ ev_io_init(&up_req->io_ev, fuzzy_peer_send_io,
+ session->ctx->peer_fd, EV_WRITE);
+ ev_io_start(session->ctx->event_loop, &up_req->io_ev);
}
else {
- g_free (up_req);
+ g_free(up_req);
}
}
}
- rspamd_fuzzy_make_reply (cmd, result, session, send_flags);
+ rspamd_fuzzy_make_reply(cmd, result, session, send_flags);
- REF_RELEASE (session);
+ REF_RELEASE(session);
}
static void
-rspamd_fuzzy_process_command (struct fuzzy_session *session)
+rspamd_fuzzy_process_command(struct fuzzy_session *session)
{
- gboolean is_shingle = FALSE, __attribute__ ((unused)) encrypted = FALSE;
+ gboolean is_shingle = FALSE, __attribute__((unused)) encrypted = FALSE;
struct rspamd_fuzzy_cmd *cmd = NULL;
struct rspamd_fuzzy_reply result;
struct fuzzy_peer_cmd up_cmd;
@@ -1193,31 +1190,31 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
switch (session->cmd_type) {
case CMD_NORMAL:
- up_len = sizeof (session->cmd.basic);
+ up_len = sizeof(session->cmd.basic);
break;
case CMD_SHINGLE:
- up_len = sizeof (session->cmd);
+ up_len = sizeof(session->cmd);
is_shingle = TRUE;
send_flags |= RSPAMD_FUZZY_REPLY_SHINGLE;
break;
case CMD_ENCRYPTED_NORMAL:
- up_len = sizeof (session->cmd.basic);
+ up_len = sizeof(session->cmd.basic);
encrypted = TRUE;
send_flags |= RSPAMD_FUZZY_REPLY_ENCRYPTED;
break;
case CMD_ENCRYPTED_SHINGLE:
- up_len = sizeof (session->cmd);
+ up_len = sizeof(session->cmd);
encrypted = TRUE;
is_shingle = TRUE;
- send_flags |= RSPAMD_FUZZY_REPLY_SHINGLE|RSPAMD_FUZZY_REPLY_ENCRYPTED;
+ send_flags |= RSPAMD_FUZZY_REPLY_SHINGLE | RSPAMD_FUZZY_REPLY_ENCRYPTED;
break;
default:
- msg_err ("invalid command type: %d", session->cmd_type);
+ msg_err("invalid command type: %d", session->cmd_type);
return;
}
- memset (&result, 0, sizeof (result));
- memcpy (result.digest, cmd->digest, sizeof (result.digest));
+ memset(&result, 0, sizeof(result));
+ memcpy(result.digest, cmd->digest, sizeof(result.digest));
result.v1.flag = cmd->flag;
result.v1.tag = cmd->tag;
@@ -1226,26 +1223,27 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
lua_State *L = session->ctx->cfg->lua_state;
gint err_idx, ret;
- lua_pushcfunction (L, &rspamd_lua_traceback);
- err_idx = lua_gettop (L);
+ lua_pushcfunction(L, &rspamd_lua_traceback);
+ err_idx = lua_gettop(L);
/* Preallocate stack (small opt) */
- lua_checkstack (L, err_idx + 5);
+ lua_checkstack(L, err_idx + 5);
/* function */
- lua_rawgeti (L, LUA_REGISTRYINDEX, session->ctx->lua_pre_handler_cbref);
+ lua_rawgeti(L, LUA_REGISTRYINDEX, session->ctx->lua_pre_handler_cbref);
/* client IP */
- rspamd_lua_ip_push (L, session->addr);
+ rspamd_lua_ip_push(L, session->addr);
/* client command */
- lua_pushinteger (L, cmd->cmd);
+ lua_pushinteger(L, cmd->cmd);
/* command value (push as rspamd_text) */
- (void)lua_new_text (L, cmd->digest, sizeof (cmd->digest), FALSE);
+ (void) lua_new_text(L, cmd->digest, sizeof(cmd->digest), FALSE);
/* is shingle */
- lua_pushboolean (L, is_shingle);
+ lua_pushboolean(L, is_shingle);
/* TODO: add additional data maybe (encryption, pubkey, etc) */
- rspamd_fuzzy_extensions_tolua (L, session);
+ rspamd_fuzzy_extensions_tolua(L, session);
- if ((ret = lua_pcall (L, 5, LUA_MULTRET, err_idx)) != 0) {
- msg_err ("call to lua_pre_handler lua "
- "script failed (%d): %s", ret, lua_tostring (L, -1));
+ if ((ret = lua_pcall(L, 5, LUA_MULTRET, err_idx)) != 0) {
+ msg_err("call to lua_pre_handler lua "
+ "script failed (%d): %s",
+ ret, lua_tostring(L, -1));
}
else {
/* Return values order:
@@ -1254,34 +1252,34 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
* 2-nd will be reply code
* 3-rd will be probability (or 0.0 if missing)
*/
- ret = lua_toboolean (L, err_idx + 1);
+ ret = lua_toboolean(L, err_idx + 1);
if (ret) {
/* Artificial reply */
- result.v1.value = lua_tointeger (L, err_idx + 2);
+ result.v1.value = lua_tointeger(L, err_idx + 2);
- if (lua_isnumber (L, err_idx + 3)) {
- result.v1.prob = lua_tonumber (L, err_idx + 3);
+ if (lua_isnumber(L, err_idx + 3)) {
+ result.v1.prob = lua_tonumber(L, err_idx + 3);
}
else {
result.v1.prob = 0.0f;
}
- lua_settop (L, 0);
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ lua_settop(L, 0);
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
return;
}
}
- lua_settop (L, 0);
+ lua_settop(L, 0);
}
- if (G_UNLIKELY (cmd == NULL || up_len == 0)) {
+ if (G_UNLIKELY(cmd == NULL || up_len == 0)) {
result.v1.value = 500;
result.v1.prob = 0.0f;
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
return;
}
@@ -1289,23 +1287,23 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
/* Do not accept unencrypted commands */
result.v1.value = 403;
result.v1.prob = 0.0f;
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
return;
}
if (session->key && session->addr) {
- ip_stat = rspamd_lru_hash_lookup (session->key->stat->last_ips,
- session->addr, -1);
+ ip_stat = rspamd_lru_hash_lookup(session->key->stat->last_ips,
+ session->addr, -1);
if (ip_stat == NULL) {
naddr = rspamd_inet_address_copy(session->addr, NULL);
- ip_stat = g_malloc0 (sizeof (*ip_stat));
- REF_INIT_RETAIN (ip_stat, fuzzy_key_stat_dtor);
- rspamd_lru_hash_insert (session->key->stat->last_ips,
- naddr, ip_stat, -1, 0);
+ ip_stat = g_malloc0(sizeof(*ip_stat));
+ REF_INIT_RETAIN(ip_stat, fuzzy_key_stat_dtor);
+ rspamd_lru_hash_insert(session->key->stat->last_ips,
+ naddr, ip_stat, -1, 0);
}
- REF_RETAIN (ip_stat);
+ REF_RETAIN(ip_stat);
session->ip_stat = ip_stat;
}
@@ -1314,41 +1312,41 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
if (session->ctx->ratelimit_buckets) {
if (session->ctx->ratelimit_log_only) {
- (void)rspamd_fuzzy_check_ratelimit (session); /* Check but ignore */
+ (void) rspamd_fuzzy_check_ratelimit(session); /* Check but ignore */
}
else {
- can_continue = rspamd_fuzzy_check_ratelimit (session);
+ can_continue = rspamd_fuzzy_check_ratelimit(session);
}
}
if (can_continue) {
- REF_RETAIN (session);
- rspamd_fuzzy_backend_check (session->ctx->backend, cmd,
- rspamd_fuzzy_check_callback, session);
+ REF_RETAIN(session);
+ rspamd_fuzzy_backend_check(session->ctx->backend, cmd,
+ rspamd_fuzzy_check_callback, session);
}
else {
result.v1.value = 403;
result.v1.prob = 0.0f;
result.v1.flag = 0;
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
}
}
else if (cmd->cmd == FUZZY_STAT) {
result.v1.prob = 1.0f;
result.v1.value = 0;
result.v1.flag = session->ctx->stat.fuzzy_hashes;
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
}
else {
- if (rspamd_fuzzy_check_write (session)) {
+ if (rspamd_fuzzy_check_write(session)) {
/* Check whitelist */
if (session->ctx->skip_hashes && cmd->cmd == FUZZY_WRITE) {
- rspamd_encode_hex_buf (cmd->digest, sizeof (cmd->digest),
- hexbuf, sizeof (hexbuf) - 1);
- hexbuf[sizeof (hexbuf) - 1] = '\0';
+ rspamd_encode_hex_buf(cmd->digest, sizeof(cmd->digest),
+ hexbuf, sizeof(hexbuf) - 1);
+ hexbuf[sizeof(hexbuf) - 1] = '\0';
- if (rspamd_match_hash_map (session->ctx->skip_hashes,
- hexbuf, sizeof (hexbuf) - 1)) {
+ if (rspamd_match_hash_map(session->ctx->skip_hashes,
+ hexbuf, sizeof(hexbuf) - 1)) {
result.v1.value = 401;
result.v1.prob = 0.0f;
@@ -1364,29 +1362,25 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
if (session->worker->index == 0 || session->ctx->peer_fd == -1) {
/* Just add to the queue */
up_cmd.is_shingle = is_shingle;
- ptr = is_shingle ?
- (gpointer)&up_cmd.cmd.shingle :
- (gpointer)&up_cmd.cmd.normal;
- memcpy (ptr, cmd, up_len);
- g_array_append_val (session->ctx->updates_pending, up_cmd);
+ ptr = is_shingle ? (gpointer) &up_cmd.cmd.shingle : (gpointer) &up_cmd.cmd.normal;
+ memcpy(ptr, cmd, up_len);
+ g_array_append_val(session->ctx->updates_pending, up_cmd);
}
else {
/* We need to send request to the peer */
- up_req = g_malloc0 (sizeof (*up_req));
+ up_req = g_malloc0(sizeof(*up_req));
up_req->cmd.is_shingle = is_shingle;
- ptr = is_shingle ?
- (gpointer)&up_req->cmd.cmd.shingle :
- (gpointer)&up_req->cmd.cmd.normal;
- memcpy (ptr, cmd, up_len);
+ ptr = is_shingle ? (gpointer) &up_req->cmd.cmd.shingle : (gpointer) &up_req->cmd.cmd.normal;
+ memcpy(ptr, cmd, up_len);
- if (!fuzzy_peer_try_send (session->ctx->peer_fd, up_req)) {
+ if (!fuzzy_peer_try_send(session->ctx->peer_fd, up_req)) {
up_req->io_ev.data = up_req;
- ev_io_init (&up_req->io_ev, fuzzy_peer_send_io,
- session->ctx->peer_fd, EV_WRITE);
- ev_io_start (session->ctx->event_loop, &up_req->io_ev);
+ ev_io_init(&up_req->io_ev, fuzzy_peer_send_io,
+ session->ctx->peer_fd, EV_WRITE);
+ ev_io_start(session->ctx->event_loop, &up_req->io_ev);
}
else {
- g_free (up_req);
+ g_free(up_req);
}
}
@@ -1397,38 +1391,38 @@ rspamd_fuzzy_process_command (struct fuzzy_session *session)
result.v1.value = 403;
result.v1.prob = 0.0f;
}
-reply:
- rspamd_fuzzy_make_reply (cmd, &result, session, send_flags);
+ reply:
+ rspamd_fuzzy_make_reply(cmd, &result, session, send_flags);
}
}
static enum rspamd_fuzzy_epoch
-rspamd_fuzzy_command_valid (struct rspamd_fuzzy_cmd *cmd, gint r)
+rspamd_fuzzy_command_valid(struct rspamd_fuzzy_cmd *cmd, gint r)
{
enum rspamd_fuzzy_epoch ret = RSPAMD_FUZZY_EPOCH_MAX;
switch (cmd->version & RSPAMD_FUZZY_VERSION_MASK) {
case 4:
if (cmd->shingles_count > 0) {
- if (r >= sizeof (struct rspamd_fuzzy_shingle_cmd)) {
+ if (r >= sizeof(struct rspamd_fuzzy_shingle_cmd)) {
ret = RSPAMD_FUZZY_EPOCH11;
}
}
else {
- if (r >= sizeof (*cmd)) {
+ if (r >= sizeof(*cmd)) {
ret = RSPAMD_FUZZY_EPOCH11;
}
}
break;
case 3:
if (cmd->shingles_count > 0) {
- if (r == sizeof (struct rspamd_fuzzy_shingle_cmd)) {
+ if (r == sizeof(struct rspamd_fuzzy_shingle_cmd)) {
ret = RSPAMD_FUZZY_EPOCH10;
}
}
else {
- if (r == sizeof (*cmd)) {
+ if (r == sizeof(*cmd)) {
ret = RSPAMD_FUZZY_EPOCH10;
}
}
@@ -1441,28 +1435,28 @@ rspamd_fuzzy_command_valid (struct rspamd_fuzzy_cmd *cmd, gint r)
}
static gboolean
-rspamd_fuzzy_decrypt_command (struct fuzzy_session *s, guchar *buf, gsize buflen)
+rspamd_fuzzy_decrypt_command(struct fuzzy_session *s, guchar *buf, gsize buflen)
{
struct rspamd_fuzzy_encrypted_req_hdr hdr;
struct rspamd_cryptobox_pubkey *rk;
struct fuzzy_key *key;
if (s->ctx->default_key == NULL) {
- msg_warn ("received encrypted request when encryption is not enabled");
+ msg_warn("received encrypted request when encryption is not enabled");
return FALSE;
}
- if (buflen < sizeof (hdr)) {
- msg_warn ("XXX: should not be reached");
+ if (buflen < sizeof(hdr)) {
+ msg_warn("XXX: should not be reached");
return FALSE;
}
- memcpy (&hdr, buf, sizeof (hdr));
- buf += sizeof (hdr);
- buflen -= sizeof (hdr);
+ memcpy(&hdr, buf, sizeof(hdr));
+ buf += sizeof(hdr);
+ buflen -= sizeof(hdr);
/* Try to find the desired key */
- key = g_hash_table_lookup (s->ctx->keys, hdr.key_id);
+ key = g_hash_table_lookup(s->ctx->keys, hdr.key_id);
if (key == NULL) {
/* Unknown key, assume default one */
@@ -1472,37 +1466,37 @@ rspamd_fuzzy_decrypt_command (struct fuzzy_session *s, guchar *buf, gsize buflen
s->key = key;
/* Now process keypair */
- rk = rspamd_pubkey_from_bin (hdr.pubkey, sizeof (hdr.pubkey),
- RSPAMD_KEYPAIR_KEX, RSPAMD_CRYPTOBOX_MODE_25519);
+ rk = rspamd_pubkey_from_bin(hdr.pubkey, sizeof(hdr.pubkey),
+ RSPAMD_KEYPAIR_KEX, RSPAMD_CRYPTOBOX_MODE_25519);
if (rk == NULL) {
- msg_err ("bad key; ip=%s",
- rspamd_inet_address_to_string (s->addr));
+ msg_err("bad key; ip=%s",
+ rspamd_inet_address_to_string(s->addr));
return FALSE;
}
- rspamd_keypair_cache_process (s->ctx->keypair_cache, key->key, rk);
+ rspamd_keypair_cache_process(s->ctx->keypair_cache, key->key, rk);
/* Now decrypt request */
- if (!rspamd_cryptobox_decrypt_nm_inplace (buf, buflen, hdr.nonce,
- rspamd_pubkey_get_nm (rk, key->key),
- hdr.mac, RSPAMD_CRYPTOBOX_MODE_25519)) {
- msg_err ("decryption failed; ip=%s",
- rspamd_inet_address_to_string (s->addr));
- rspamd_pubkey_unref (rk);
+ if (!rspamd_cryptobox_decrypt_nm_inplace(buf, buflen, hdr.nonce,
+ rspamd_pubkey_get_nm(rk, key->key),
+ hdr.mac, RSPAMD_CRYPTOBOX_MODE_25519)) {
+ msg_err("decryption failed; ip=%s",
+ rspamd_inet_address_to_string(s->addr));
+ rspamd_pubkey_unref(rk);
return FALSE;
}
- memcpy (s->nm, rspamd_pubkey_get_nm (rk, key->key), sizeof (s->nm));
- rspamd_pubkey_unref (rk);
+ memcpy(s->nm, rspamd_pubkey_get_nm(rk, key->key), sizeof(s->nm));
+ rspamd_pubkey_unref(rk);
return TRUE;
}
static gboolean
-rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize buflen)
+rspamd_fuzzy_extensions_from_wire(struct fuzzy_session *s, guchar *buf, gsize buflen)
{
struct rspamd_fuzzy_cmd_extension *ext, *prev_ext;
guchar *storage, *p = buf, *end = buf + buflen;
@@ -1519,7 +1513,7 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
if (dom_len <= (end - p)) {
st_len += dom_len;
- n_ext ++;
+ n_ext++;
}
else {
/* Truncation */
@@ -1529,28 +1523,28 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
p += dom_len;
}
else if (cmd == RSPAMD_FUZZY_EXT_SOURCE_IP4) {
- if (end - p >= sizeof (in_addr_t)) {
- n_ext ++;
- st_len += sizeof (in_addr_t);
+ if (end - p >= sizeof(in_addr_t)) {
+ n_ext++;
+ st_len += sizeof(in_addr_t);
}
else {
/* Truncation */
return FALSE;
}
- p += sizeof (in_addr_t);
+ p += sizeof(in_addr_t);
}
else if (cmd == RSPAMD_FUZZY_EXT_SOURCE_IP6) {
- if (end - p >= sizeof (struct in6_addr)) {
- n_ext ++;
- st_len += sizeof (struct in6_addr);
+ if (end - p >= sizeof(struct in6_addr)) {
+ n_ext++;
+ st_len += sizeof(struct in6_addr);
}
else {
/* Truncation */
return FALSE;
}
- p += sizeof (struct in6_addr);
+ p += sizeof(struct in6_addr);
}
else {
/* Invalid command */
@@ -1569,12 +1563,12 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
* Memory layout: n_ext of struct rspamd_fuzzy_cmd_extension
* payload for each extension in a continuous data segment
*/
- storage = g_malloc (n_ext * sizeof (struct rspamd_fuzzy_cmd_extension) +
- st_len);
+ storage = g_malloc(n_ext * sizeof(struct rspamd_fuzzy_cmd_extension) +
+ st_len);
guchar *data_buf = storage +
- n_ext * sizeof (struct rspamd_fuzzy_cmd_extension);
- ext = (struct rspamd_fuzzy_cmd_extension *)storage;
+ n_ext * sizeof(struct rspamd_fuzzy_cmd_extension);
+ ext = (struct rspamd_fuzzy_cmd_extension *) storage;
/* All validation has been done, so we can just go further */
while (p < end) {
@@ -1590,7 +1584,7 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
ext->next = ext + 1;
ext->length = dom_len;
ext->payload = dest;
- memcpy (dest, p, dom_len);
+ memcpy(dest, p, dom_len);
p += dom_len;
data_buf += dom_len;
ext = ext->next;
@@ -1600,11 +1594,11 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
ext->ext = RSPAMD_FUZZY_EXT_SOURCE_IP4;
ext->next = ext + 1;
- ext->length = sizeof (in_addr_t);
+ ext->length = sizeof(in_addr_t);
ext->payload = dest;
- memcpy (dest, p, sizeof (in_addr_t));
- p += sizeof (in_addr_t);
- data_buf += sizeof (in_addr_t);
+ memcpy(dest, p, sizeof(in_addr_t));
+ p += sizeof(in_addr_t);
+ data_buf += sizeof(in_addr_t);
ext = ext->next;
}
else if (cmd == RSPAMD_FUZZY_EXT_SOURCE_IP6) {
@@ -1612,15 +1606,15 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
ext->ext = RSPAMD_FUZZY_EXT_SOURCE_IP6;
ext->next = ext + 1;
- ext->length = sizeof (struct in6_addr);
+ ext->length = sizeof(struct in6_addr);
ext->payload = dest;
- memcpy (dest, p, sizeof (struct in6_addr));
- p += sizeof (struct in6_addr);
- data_buf += sizeof (struct in6_addr);
+ memcpy(dest, p, sizeof(struct in6_addr));
+ p += sizeof(struct in6_addr);
+ data_buf += sizeof(struct in6_addr);
ext = ext->next;
}
else {
- g_assert_not_reached ();
+ g_assert_not_reached();
}
}
@@ -1628,7 +1622,7 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
prev_ext->next = NULL;
/* Rewind to the begin */
- ext = (struct rspamd_fuzzy_cmd_extension *)storage;
+ ext = (struct rspamd_fuzzy_cmd_extension *) storage;
s->extensions = ext;
}
@@ -1636,20 +1630,20 @@ rspamd_fuzzy_extensions_from_wire (struct fuzzy_session *s, guchar *buf, gsize b
}
static gboolean
-rspamd_fuzzy_cmd_from_wire (guchar *buf, guint buflen, struct fuzzy_session *s)
+rspamd_fuzzy_cmd_from_wire(guchar *buf, guint buflen, struct fuzzy_session *s)
{
enum rspamd_fuzzy_epoch epoch;
gboolean encrypted = FALSE;
- if (buflen < sizeof (struct rspamd_fuzzy_cmd)) {
- msg_debug ("truncated fuzzy command of size %d received", buflen);
+ if (buflen < sizeof(struct rspamd_fuzzy_cmd)) {
+ msg_debug("truncated fuzzy command of size %d received", buflen);
return FALSE;
}
/* Now check encryption */
- if (buflen >= sizeof (struct rspamd_fuzzy_encrypted_cmd)) {
- if (memcmp (buf, fuzzy_encrypted_magic, sizeof (fuzzy_encrypted_magic)) == 0) {
+ if (buflen >= sizeof(struct rspamd_fuzzy_encrypted_cmd)) {
+ if (memcmp(buf, fuzzy_encrypted_magic, sizeof(fuzzy_encrypted_magic)) == 0) {
/* Encrypted command */
encrypted = TRUE;
}
@@ -1657,7 +1651,7 @@ rspamd_fuzzy_cmd_from_wire (guchar *buf, guint buflen, struct fuzzy_session *s)
if (encrypted) {
/* Decrypt first */
- if (!rspamd_fuzzy_decrypt_command (s, buf, buflen)) {
+ if (!rspamd_fuzzy_decrypt_command(s, buf, buflen)) {
return FALSE;
}
else {
@@ -1665,44 +1659,44 @@ rspamd_fuzzy_cmd_from_wire (guchar *buf, guint buflen, struct fuzzy_session *s)
* Advance buffer to skip encrypted header.
* Note that after rspamd_fuzzy_decrypt_command buf is unencrypted
*/
- buf += sizeof (struct rspamd_fuzzy_encrypted_req_hdr);
- buflen -= sizeof (struct rspamd_fuzzy_encrypted_req_hdr);
+ buf += sizeof(struct rspamd_fuzzy_encrypted_req_hdr);
+ buflen -= sizeof(struct rspamd_fuzzy_encrypted_req_hdr);
}
}
/* Fill the normal command */
- if (buflen < sizeof (s->cmd.basic)) {
- msg_debug ("truncated normal fuzzy command of size %d received", buflen);
+ if (buflen < sizeof(s->cmd.basic)) {
+ msg_debug("truncated normal fuzzy command of size %d received", buflen);
return FALSE;
}
- memcpy (&s->cmd.basic, buf, sizeof (s->cmd.basic));
- epoch = rspamd_fuzzy_command_valid (&s->cmd.basic, buflen);
+ memcpy(&s->cmd.basic, buf, sizeof(s->cmd.basic));
+ epoch = rspamd_fuzzy_command_valid(&s->cmd.basic, buflen);
if (epoch == RSPAMD_FUZZY_EPOCH_MAX) {
- msg_debug ("invalid fuzzy command of size %d received", buflen);
+ msg_debug("invalid fuzzy command of size %d received", buflen);
return FALSE;
}
s->epoch = epoch;
/* Advance buf */
- buf += sizeof (s->cmd.basic);
- buflen -= sizeof (s->cmd.basic);
+ buf += sizeof(s->cmd.basic);
+ buflen -= sizeof(s->cmd.basic);
if (s->cmd.basic.shingles_count > 0) {
- if (buflen >= sizeof (s->cmd.sgl)) {
+ if (buflen >= sizeof(s->cmd.sgl)) {
/* Copy the shingles part */
- memcpy (&s->cmd.sgl, buf, sizeof (s->cmd.sgl));
+ memcpy(&s->cmd.sgl, buf, sizeof(s->cmd.sgl));
}
else {
/* Truncated stuff */
- msg_debug ("truncated fuzzy shingles command of size %d received", buflen);
+ msg_debug("truncated fuzzy shingles command of size %d received", buflen);
return FALSE;
}
- buf += sizeof (s->cmd.sgl);
- buflen -= sizeof (s->cmd.sgl);
+ buf += sizeof(s->cmd.sgl);
+ buflen -= sizeof(s->cmd.sgl);
if (encrypted) {
s->cmd_type = CMD_ENCRYPTED_SHINGLE;
@@ -1722,8 +1716,8 @@ rspamd_fuzzy_cmd_from_wire (guchar *buf, guint buflen, struct fuzzy_session *s)
if (buflen > 0) {
/* Process possible extensions */
- if (!rspamd_fuzzy_extensions_from_wire (s, buf, buflen)) {
- msg_debug ("truncated fuzzy shingles command of size %d received", buflen);
+ if (!rspamd_fuzzy_extensions_from_wire(s, buf, buflen)) {
+ msg_debug("truncated fuzzy shingles command of size %d received", buflen);
return FALSE;
}
}
@@ -1733,23 +1727,23 @@ rspamd_fuzzy_cmd_from_wire (guchar *buf, guint buflen, struct fuzzy_session *s)
static void
-fuzzy_session_destroy (gpointer d)
+fuzzy_session_destroy(gpointer d)
{
struct fuzzy_session *session = d;
- rspamd_inet_address_free (session->addr);
- rspamd_explicit_memzero (session->nm, sizeof (session->nm));
+ rspamd_inet_address_free(session->addr);
+ rspamd_explicit_memzero(session->nm, sizeof(session->nm));
session->worker->nconns--;
if (session->ip_stat) {
- REF_RELEASE (session->ip_stat);
+ REF_RELEASE(session->ip_stat);
}
if (session->extensions) {
- g_free (session->extensions);
+ g_free(session->extensions);
}
- g_free (session);
+ g_free(session);
}
#define FUZZY_INPUT_BUFLEN 1024
@@ -1770,9 +1764,9 @@ union sa_union {
* Accept new connection and construct task
*/
static void
-accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
+accept_fuzzy_socket(EV_P_ ev_io *w, int revents)
{
- struct rspamd_worker *worker = (struct rspamd_worker *)w->data;
+ struct rspamd_worker *worker = (struct rspamd_worker *) w->data;
struct rspamd_fuzzy_storage_ctx *ctx;
struct fuzzy_session *session;
gssize r, msg_len;
@@ -1780,7 +1774,7 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
struct iovec iovs[MSGVEC_LEN];
guint8 bufs[MSGVEC_LEN][FUZZY_INPUT_BUFLEN];
union sa_union peer_sa[MSGVEC_LEN];
- socklen_t salen = sizeof (peer_sa[0]);
+ socklen_t salen = sizeof(peer_sa[0]);
#ifdef HAVE_RECVMMSG
#define MSG_FIELD(msg, field) msg.msg_hdr.field
struct mmsghdr msg[MSGVEC_LEN];
@@ -1789,15 +1783,15 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
struct msghdr msg[MSGVEC_LEN];
#endif
- memset (msg, 0, sizeof (*msg) * MSGVEC_LEN);
- ctx = (struct rspamd_fuzzy_storage_ctx *)worker->ctx;
+ memset(msg, 0, sizeof(*msg) * MSGVEC_LEN);
+ ctx = (struct rspamd_fuzzy_storage_ctx *) worker->ctx;
/* Prepare messages to receive */
- for (int i = 0; i < MSGVEC_LEN; i ++) {
+ for (int i = 0; i < MSGVEC_LEN; i++) {
/* Prepare msghdr structs */
iovs[i].iov_base = bufs[i];
- iovs[i].iov_len = sizeof (bufs[i]);
- MSG_FIELD(msg[i], msg_name) = (void *)&peer_sa[i];
+ iovs[i].iov_len = sizeof(bufs[i]);
+ MSG_FIELD(msg[i], msg_name) = (void *) &peer_sa[i];
MSG_FIELD(msg[i], msg_namelen) = salen;
MSG_FIELD(msg[i], msg_iov) = &iovs[i];
MSG_FIELD(msg[i], msg_iovlen) = 1;
@@ -1805,12 +1799,12 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
/* Got some data */
if (revents == EV_READ) {
- ev_now_update_if_cheap (ctx->event_loop);
+ ev_now_update_if_cheap(ctx->event_loop);
for (;;) {
#ifdef HAVE_RECVMMSG
- r = recvmmsg (w->fd, msg, MSGVEC_LEN, 0, NULL);
+ r = recvmmsg(w->fd, msg, MSGVEC_LEN, 0, NULL);
#else
- r = recvmsg (w->fd, msg, 0);
+ r = recvmsg(w->fd, msg, 0);
#endif
if (r == -1) {
@@ -1822,26 +1816,26 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
return;
}
- msg_err ("got error while reading from socket: %d, %s",
+ msg_err("got error while reading from socket: %d, %s",
errno,
- strerror (errno));
+ strerror(errno));
return;
}
#ifndef HAVE_RECVMMSG
msg_len = r; /* Save real length in bytes here */
- r = 1; /* Assume that we have received a single message */
+ r = 1; /* Assume that we have received a single message */
#endif
- for (int i = 0; i < r; i ++) {
+ for (int i = 0; i < r; i++) {
rspamd_inet_addr_t *client_addr;
if (MSG_FIELD(msg[i], msg_namelen) >= sizeof(struct sockaddr)) {
client_addr = rspamd_inet_address_from_sa(MSG_FIELD(msg[i], msg_name),
- MSG_FIELD(msg[i], msg_namelen));
- if (!rspamd_fuzzy_check_client (worker->ctx, client_addr)) {
+ MSG_FIELD(msg[i], msg_namelen));
+ if (!rspamd_fuzzy_check_client(worker->ctx, client_addr)) {
/* Disallow forbidden clients silently */
- rspamd_inet_address_free (client_addr);
+ rspamd_inet_address_free(client_addr);
continue;
}
}
@@ -1849,12 +1843,12 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
client_addr = NULL;
}
- session = g_malloc0 (sizeof (*session));
- REF_INIT_RETAIN (session, fuzzy_session_destroy);
+ session = g_malloc0(sizeof(*session));
+ REF_INIT_RETAIN(session, fuzzy_session_destroy);
session->worker = worker;
session->fd = w->fd;
session->ctx = ctx;
- session->timestamp = ev_now (ctx->event_loop);
+ session->timestamp = ev_now(ctx->event_loop);
session->addr = client_addr;
worker->nconns++;
@@ -1863,26 +1857,26 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
msg_len = msg[i].msg_len;
#endif
- if (rspamd_fuzzy_cmd_from_wire (iovs[i].iov_base,
- msg_len, session)) {
+ if (rspamd_fuzzy_cmd_from_wire(iovs[i].iov_base,
+ msg_len, session)) {
/* Check shingles count sanity */
- rspamd_fuzzy_process_command (session);
+ rspamd_fuzzy_process_command(session);
}
else {
/* Discard input */
- session->ctx->stat.invalid_requests ++;
- msg_debug ("invalid fuzzy command of size %z received", r);
+ session->ctx->stat.invalid_requests++;
+ msg_debug("invalid fuzzy command of size %z received", r);
if (session->addr) {
nerrors = rspamd_lru_hash_lookup(session->ctx->errors_ips,
- session->addr, -1);
+ session->addr, -1);
if (nerrors == NULL) {
nerrors = g_malloc(sizeof(*nerrors));
*nerrors = 1;
rspamd_lru_hash_insert(session->ctx->errors_ips,
- rspamd_inet_address_copy(session->addr, NULL),
- nerrors, -1, -1);
+ rspamd_inet_address_copy(session->addr, NULL),
+ nerrors, -1, -1);
}
else {
*nerrors = *nerrors + 1;
@@ -1890,7 +1884,7 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
}
}
- REF_RELEASE (session);
+ REF_RELEASE(session);
}
#ifdef HAVE_RECVMMSG
/* Stop reading as we are using recvmmsg instead of recvmsg */
@@ -1901,12 +1895,12 @@ accept_fuzzy_socket (EV_P_ ev_io *w, int revents)
}
static gboolean
-rspamd_fuzzy_storage_periodic_callback (void *ud)
+rspamd_fuzzy_storage_periodic_callback(void *ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
if (ctx->updates_pending->len > 0) {
- rspamd_fuzzy_process_updates_queue (ctx, local_db_name, FALSE);
+ rspamd_fuzzy_process_updates_queue(ctx, local_db_name, FALSE);
return TRUE;
}
@@ -1915,11 +1909,11 @@ rspamd_fuzzy_storage_periodic_callback (void *ud)
}
static gboolean
-rspamd_fuzzy_storage_sync (struct rspamd_main *rspamd_main,
- struct rspamd_worker *worker, gint fd,
- gint attached_fd,
- struct rspamd_control_command *cmd,
- gpointer ud)
+rspamd_fuzzy_storage_sync(struct rspamd_main *rspamd_main,
+ struct rspamd_worker *worker, gint fd,
+ gint attached_fd,
+ struct rspamd_control_command *cmd,
+ gpointer ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
struct rspamd_control_reply rep;
@@ -1928,30 +1922,30 @@ rspamd_fuzzy_storage_sync (struct rspamd_main *rspamd_main,
rep.type = RSPAMD_CONTROL_FUZZY_SYNC;
if (ctx->backend && worker->index == 0) {
- rspamd_fuzzy_process_updates_queue (ctx, local_db_name, FALSE);
- rspamd_fuzzy_backend_start_update (ctx->backend, ctx->sync_timeout,
- rspamd_fuzzy_storage_periodic_callback, ctx);
+ rspamd_fuzzy_process_updates_queue(ctx, local_db_name, FALSE);
+ rspamd_fuzzy_backend_start_update(ctx->backend, ctx->sync_timeout,
+ rspamd_fuzzy_storage_periodic_callback, ctx);
}
- if (write (fd, &rep, sizeof (rep)) != sizeof (rep)) {
- msg_err ("cannot write reply to the control socket: %s",
- strerror (errno));
+ if (write(fd, &rep, sizeof(rep)) != sizeof(rep)) {
+ msg_err("cannot write reply to the control socket: %s",
+ strerror(errno));
}
return TRUE;
}
static gboolean
-rspamd_fuzzy_control_blocked (struct rspamd_main *rspamd_main,
- struct rspamd_worker *worker, gint fd,
- gint attached_fd,
- struct rspamd_control_command *cmd,
- gpointer ud)
+rspamd_fuzzy_control_blocked(struct rspamd_main *rspamd_main,
+ struct rspamd_worker *worker, gint fd,
+ gint attached_fd,
+ struct rspamd_control_command *cmd,
+ gpointer ud)
{
- struct rspamd_fuzzy_storage_ctx *ctx = (struct rspamd_fuzzy_storage_ctx *)ud;
+ struct rspamd_fuzzy_storage_ctx *ctx = (struct rspamd_fuzzy_storage_ctx *) ud;
struct rspamd_control_reply rep;
struct rspamd_leaky_bucket_elt *elt;
- ev_tstamp now = ev_now (ctx->event_loop);
+ ev_tstamp now = ev_now(ctx->event_loop);
rspamd_inet_addr_t *addr = NULL;
rep.type = RSPAMD_CONTROL_FUZZY_BLOCKED;
@@ -1959,37 +1953,36 @@ rspamd_fuzzy_control_blocked (struct rspamd_main *rspamd_main,
if (cmd->cmd.fuzzy_blocked.af == AF_INET) {
addr = rspamd_inet_address_from_sa(&cmd->cmd.fuzzy_blocked.addr.sa,
- sizeof (struct sockaddr_in));
+ sizeof(struct sockaddr_in));
}
else if (cmd->cmd.fuzzy_blocked.af == AF_INET6) {
addr = rspamd_inet_address_from_sa(&cmd->cmd.fuzzy_blocked.addr.sa,
- sizeof (struct sockaddr_in6));
+ sizeof(struct sockaddr_in6));
}
else {
- msg_err ("invalid address family: %d", cmd->cmd.fuzzy_blocked.af);
+ msg_err("invalid address family: %d", cmd->cmd.fuzzy_blocked.af);
rep.reply.fuzzy_blocked.status = -1;
}
if (addr) {
elt = rspamd_lru_hash_lookup(ctx->ratelimit_buckets, addr,
- (time_t) now);
+ (time_t) now);
if (elt) {
- if (isnan (elt->cur)) {
+ if (isnan(elt->cur)) {
/* Already ratelimited, ignore */
}
else {
elt->last = now;
elt->cur = NAN;
- msg_info ("propagating ratelimiting %s, %.1f max elts",
- rspamd_inet_address_to_string(addr),
- ctx->leaky_bucket_burst);
+ msg_info("propagating ratelimiting %s, %.1f max elts",
+ rspamd_inet_address_to_string(addr),
+ ctx->leaky_bucket_burst);
rspamd_fuzzy_maybe_call_blacklisted(ctx, addr, "ratelimit");
}
rspamd_inet_address_free(addr);
-
}
else {
/* New bucket */
@@ -1999,97 +1992,97 @@ rspamd_fuzzy_control_blocked (struct rspamd_main *rspamd_main,
elt->last = now;
rspamd_lru_hash_insert(ctx->ratelimit_buckets,
- addr,
- elt,
- (time_t)now,
- ctx->leaky_bucket_ttl);
- msg_info ("propagating ratelimiting %s, %.1f max elts",
- rspamd_inet_address_to_string(addr),
- ctx->leaky_bucket_burst);
+ addr,
+ elt,
+ (time_t) now,
+ ctx->leaky_bucket_ttl);
+ msg_info("propagating ratelimiting %s, %.1f max elts",
+ rspamd_inet_address_to_string(addr),
+ ctx->leaky_bucket_burst);
rspamd_fuzzy_maybe_call_blacklisted(ctx, addr, "ratelimit");
}
}
- if (write (fd, &rep, sizeof (rep)) != sizeof (rep)) {
- msg_err ("cannot write reply to the control socket: %s",
- strerror (errno));
+ if (write(fd, &rep, sizeof(rep)) != sizeof(rep)) {
+ msg_err("cannot write reply to the control socket: %s",
+ strerror(errno));
}
return TRUE;
}
static gboolean
-rspamd_fuzzy_storage_reload (struct rspamd_main *rspamd_main,
- struct rspamd_worker *worker, gint fd,
- gint attached_fd,
- struct rspamd_control_command *cmd,
- gpointer ud)
+rspamd_fuzzy_storage_reload(struct rspamd_main *rspamd_main,
+ struct rspamd_worker *worker, gint fd,
+ gint attached_fd,
+ struct rspamd_control_command *cmd,
+ gpointer ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
GError *err = NULL;
struct rspamd_control_reply rep;
- msg_info ("reloading fuzzy storage after receiving reload command");
+ msg_info("reloading fuzzy storage after receiving reload command");
if (ctx->backend) {
/* Close backend and reopen it one more time */
- rspamd_fuzzy_backend_close (ctx->backend);
+ rspamd_fuzzy_backend_close(ctx->backend);
}
- memset (&rep, 0, sizeof (rep));
+ memset(&rep, 0, sizeof(rep));
rep.type = RSPAMD_CONTROL_RELOAD;
- if ((ctx->backend = rspamd_fuzzy_backend_create (ctx->event_loop,
- worker->cf->options, rspamd_main->cfg,
- &err)) == NULL) {
- msg_err ("cannot open backend after reload: %e", err);
+ if ((ctx->backend = rspamd_fuzzy_backend_create(ctx->event_loop,
+ worker->cf->options, rspamd_main->cfg,
+ &err)) == NULL) {
+ msg_err("cannot open backend after reload: %e", err);
rep.reply.reload.status = err->code;
- g_error_free (err);
+ g_error_free(err);
}
else {
rep.reply.reload.status = 0;
}
if (ctx->backend && worker->index == 0) {
- rspamd_fuzzy_backend_start_update (ctx->backend, ctx->sync_timeout,
- rspamd_fuzzy_storage_periodic_callback, ctx);
+ rspamd_fuzzy_backend_start_update(ctx->backend, ctx->sync_timeout,
+ rspamd_fuzzy_storage_periodic_callback, ctx);
}
- if (write (fd, &rep, sizeof (rep)) != sizeof (rep)) {
- msg_err ("cannot write reply to the control socket: %s",
- strerror (errno));
+ if (write(fd, &rep, sizeof(rep)) != sizeof(rep)) {
+ msg_err("cannot write reply to the control socket: %s",
+ strerror(errno));
}
return TRUE;
}
static ucl_object_t *
-rspamd_fuzzy_storage_stat_key (const struct fuzzy_key_stat *key_stat)
+rspamd_fuzzy_storage_stat_key(const struct fuzzy_key_stat *key_stat)
{
ucl_object_t *res;
- res = ucl_object_typed_new (UCL_OBJECT);
-
- ucl_object_insert_key (res, ucl_object_fromint (key_stat->checked),
- "checked", 0, false);
- ucl_object_insert_key (res, ucl_object_fromdouble(key_stat->checked_ctr.mean),
- "checked_per_hour", 0, false);
- ucl_object_insert_key (res, ucl_object_fromint (key_stat->matched),
- "matched", 0, false);
- ucl_object_insert_key (res, ucl_object_fromdouble(key_stat->matched_ctr.mean),
- "matched_per_hour", 0, false);
- ucl_object_insert_key (res, ucl_object_fromint (key_stat->added),
- "added", 0, false);
- ucl_object_insert_key (res, ucl_object_fromint (key_stat->deleted),
- "deleted", 0, false);
- ucl_object_insert_key (res, ucl_object_fromint (key_stat->errors),
- "errors", 0, false);
+ res = ucl_object_typed_new(UCL_OBJECT);
+
+ ucl_object_insert_key(res, ucl_object_fromint(key_stat->checked),
+ "checked", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromdouble(key_stat->checked_ctr.mean),
+ "checked_per_hour", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromint(key_stat->matched),
+ "matched", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromdouble(key_stat->matched_ctr.mean),
+ "matched_per_hour", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromint(key_stat->added),
+ "added", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromint(key_stat->deleted),
+ "deleted", 0, false);
+ ucl_object_insert_key(res, ucl_object_fromint(key_stat->errors),
+ "errors", 0, false);
return res;
}
static ucl_object_t *
-rspamd_fuzzy_stat_to_ucl (struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat)
+rspamd_fuzzy_stat_to_ucl(struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat)
{
struct fuzzy_key_stat *key_stat;
GHashTableIter it;
@@ -2099,32 +2092,32 @@ rspamd_fuzzy_stat_to_ucl (struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat
gint i;
gchar keyname[17];
- obj = ucl_object_typed_new (UCL_OBJECT);
+ obj = ucl_object_typed_new(UCL_OBJECT);
- keys_obj = ucl_object_typed_new (UCL_OBJECT);
- g_hash_table_iter_init (&it, ctx->keys);
+ keys_obj = ucl_object_typed_new(UCL_OBJECT);
+ g_hash_table_iter_init(&it, ctx->keys);
- while (g_hash_table_iter_next (&it, &k, &v)) {
+ while (g_hash_table_iter_next(&it, &k, &v)) {
fuzzy_key = v;
key_stat = fuzzy_key->stat;
if (key_stat) {
- rspamd_snprintf (keyname, sizeof (keyname), "%8bs", k);
+ rspamd_snprintf(keyname, sizeof(keyname), "%8bs", k);
- elt = rspamd_fuzzy_storage_stat_key (key_stat);
+ elt = rspamd_fuzzy_storage_stat_key(key_stat);
if (key_stat->last_ips && ip_stat) {
i = 0;
- ip_elt = ucl_object_typed_new (UCL_OBJECT);
+ ip_elt = ucl_object_typed_new(UCL_OBJECT);
- while ((i = rspamd_lru_hash_foreach (key_stat->last_ips,
- i, &k, &v)) != -1) {
- ip_cur = rspamd_fuzzy_storage_stat_key (v);
- ucl_object_insert_key (ip_elt, ip_cur,
- rspamd_inet_address_to_string (k), 0, true);
+ while ((i = rspamd_lru_hash_foreach(key_stat->last_ips,
+ i, &k, &v)) != -1) {
+ ip_cur = rspamd_fuzzy_storage_stat_key(v);
+ ucl_object_insert_key(ip_elt, ip_cur,
+ rspamd_inet_address_to_string(k), 0, true);
}
- ucl_object_insert_key (elt, ip_elt, "ips", 0, false);
+ ucl_object_insert_key(elt, ip_elt, "ips", 0, false);
}
int flag;
@@ -2134,105 +2127,105 @@ rspamd_fuzzy_stat_to_ucl (struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat
kh_foreach_key_value_ptr(fuzzy_key->flags_stat, flag, flag_stat, {
char intbuf[16];
rspamd_snprintf(intbuf, sizeof(intbuf), "%d", flag);
- ucl_object_insert_key (flags_ucl, rspamd_fuzzy_storage_stat_key (flag_stat),
- intbuf, 0, true);
+ ucl_object_insert_key(flags_ucl, rspamd_fuzzy_storage_stat_key(flag_stat),
+ intbuf, 0, true);
});
- ucl_object_insert_key (elt, flags_ucl, "flags", 0, false);
+ ucl_object_insert_key(elt, flags_ucl, "flags", 0, false);
- ucl_object_insert_key (elt,
- rspamd_keypair_to_ucl (fuzzy_key->key, RSPAMD_KEYPAIR_DUMP_NO_SECRET|RSPAMD_KEYPAIR_DUMP_FLATTENED),
- "keypair", 0, false);
- ucl_object_insert_key (keys_obj, elt, keyname, 0, true);
+ ucl_object_insert_key(elt,
+ rspamd_keypair_to_ucl(fuzzy_key->key, RSPAMD_KEYPAIR_DUMP_NO_SECRET | RSPAMD_KEYPAIR_DUMP_FLATTENED),
+ "keypair", 0, false);
+ ucl_object_insert_key(keys_obj, elt, keyname, 0, true);
}
}
- ucl_object_insert_key (obj, keys_obj, "keys", 0, false);
+ ucl_object_insert_key(obj, keys_obj, "keys", 0, false);
/* Now generic stats */
- ucl_object_insert_key (obj,
- ucl_object_fromint (ctx->stat.fuzzy_hashes),
- "fuzzy_stored",
- 0,
- false);
- ucl_object_insert_key (obj,
- ucl_object_fromint (ctx->stat.fuzzy_hashes_expired),
- "fuzzy_expired",
- 0,
- false);
- ucl_object_insert_key (obj,
- ucl_object_fromint (ctx->stat.invalid_requests),
- "invalid_requests",
- 0,
- false);
- ucl_object_insert_key (obj,
- ucl_object_fromint (ctx->stat.delayed_hashes),
- "delayed_hashes",
- 0,
- false);
+ ucl_object_insert_key(obj,
+ ucl_object_fromint(ctx->stat.fuzzy_hashes),
+ "fuzzy_stored",
+ 0,
+ false);
+ ucl_object_insert_key(obj,
+ ucl_object_fromint(ctx->stat.fuzzy_hashes_expired),
+ "fuzzy_expired",
+ 0,
+ false);
+ ucl_object_insert_key(obj,
+ ucl_object_fromint(ctx->stat.invalid_requests),
+ "invalid_requests",
+ 0,
+ false);
+ ucl_object_insert_key(obj,
+ ucl_object_fromint(ctx->stat.delayed_hashes),
+ "delayed_hashes",
+ 0,
+ false);
if (ctx->errors_ips && ip_stat) {
i = 0;
- ip_elt = ucl_object_typed_new (UCL_OBJECT);
+ ip_elt = ucl_object_typed_new(UCL_OBJECT);
- while ((i = rspamd_lru_hash_foreach (ctx->errors_ips, i, &k, &v)) != -1) {
- ucl_object_insert_key (ip_elt,
- ucl_object_fromint (*(guint64 *)v),
- rspamd_inet_address_to_string (k), 0, true);
+ while ((i = rspamd_lru_hash_foreach(ctx->errors_ips, i, &k, &v)) != -1) {
+ ucl_object_insert_key(ip_elt,
+ ucl_object_fromint(*(guint64 *) v),
+ rspamd_inet_address_to_string(k), 0, true);
}
- ucl_object_insert_key (obj,
- ip_elt,
- "errors_ips",
- 0,
- false);
+ ucl_object_insert_key(obj,
+ ip_elt,
+ "errors_ips",
+ 0,
+ false);
}
/* Checked by epoch */
- elt = ucl_object_typed_new (UCL_ARRAY);
+ elt = ucl_object_typed_new(UCL_ARRAY);
for (i = RSPAMD_FUZZY_EPOCH10; i < RSPAMD_FUZZY_EPOCH_MAX; i++) {
- ucl_array_append (elt,
- ucl_object_fromint (ctx->stat.fuzzy_hashes_checked[i]));
+ ucl_array_append(elt,
+ ucl_object_fromint(ctx->stat.fuzzy_hashes_checked[i]));
}
- ucl_object_insert_key (obj, elt, "fuzzy_checked", 0, false);
+ ucl_object_insert_key(obj, elt, "fuzzy_checked", 0, false);
/* Shingles by epoch */
- elt = ucl_object_typed_new (UCL_ARRAY);
+ elt = ucl_object_typed_new(UCL_ARRAY);
for (i = RSPAMD_FUZZY_EPOCH10; i < RSPAMD_FUZZY_EPOCH_MAX; i++) {
- ucl_array_append (elt,
- ucl_object_fromint (ctx->stat.fuzzy_shingles_checked[i]));
+ ucl_array_append(elt,
+ ucl_object_fromint(ctx->stat.fuzzy_shingles_checked[i]));
}
- ucl_object_insert_key (obj, elt, "fuzzy_shingles", 0, false);
+ ucl_object_insert_key(obj, elt, "fuzzy_shingles", 0, false);
/* Matched by epoch */
- elt = ucl_object_typed_new (UCL_ARRAY);
+ elt = ucl_object_typed_new(UCL_ARRAY);
for (i = RSPAMD_FUZZY_EPOCH10; i < RSPAMD_FUZZY_EPOCH_MAX; i++) {
- ucl_array_append (elt,
- ucl_object_fromint (ctx->stat.fuzzy_hashes_found[i]));
+ ucl_array_append(elt,
+ ucl_object_fromint(ctx->stat.fuzzy_hashes_found[i]));
}
- ucl_object_insert_key (obj, elt, "fuzzy_found", 0, false);
+ ucl_object_insert_key(obj, elt, "fuzzy_found", 0, false);
return obj;
}
static void
-rspamd_fuzzy_maybe_load_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
+rspamd_fuzzy_maybe_load_ratelimits(struct rspamd_fuzzy_storage_ctx *ctx)
{
char path[PATH_MAX];
rspamd_snprintf(path, sizeof(path), "%s" G_DIR_SEPARATOR_S "fuzzy_ratelimits.ucl",
- RSPAMD_DBDIR);
+ RSPAMD_DBDIR);
- if (access (path, R_OK) != -1) {
- struct ucl_parser *parser = ucl_parser_new(UCL_PARSER_NO_IMPLICIT_ARRAYS|UCL_PARSER_DISABLE_MACRO);
+ if (access(path, R_OK) != -1) {
+ struct ucl_parser *parser = ucl_parser_new(UCL_PARSER_NO_IMPLICIT_ARRAYS | UCL_PARSER_DISABLE_MACRO);
if (ucl_parser_add_file(parser, path)) {
const ucl_object_t *obj = ucl_parser_get_object(parser);
int loaded = 0;
@@ -2266,14 +2259,14 @@ rspamd_fuzzy_maybe_load_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
rspamd_inet_addr_t *addr;
if (rspamd_parse_inet_address(&addr, ip_str, strlen(ip_str),
- RSPAMD_INET_ADDRESS_PARSE_NO_UNIX|RSPAMD_INET_ADDRESS_PARSE_NO_PORT)) {
+ RSPAMD_INET_ADDRESS_PARSE_NO_UNIX | RSPAMD_INET_ADDRESS_PARSE_NO_PORT)) {
struct rspamd_leaky_bucket_elt *elt = g_malloc(sizeof(*elt));
elt->cur = limit_val;
elt->last = last_val;
elt->addr = addr;
rspamd_lru_hash_insert(ctx->ratelimit_buckets, addr, elt, elt->last, ctx->leaky_bucket_ttl);
- loaded ++;
+ loaded++;
}
else {
msg_err("invalid ratelimit ip: %s", ip_str);
@@ -2290,12 +2283,12 @@ rspamd_fuzzy_maybe_load_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
}
static void
-rspamd_fuzzy_maybe_save_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
+rspamd_fuzzy_maybe_save_ratelimits(struct rspamd_fuzzy_storage_ctx *ctx)
{
char path[PATH_MAX];
rspamd_snprintf(path, sizeof(path), "%s" G_DIR_SEPARATOR_S "fuzzy_ratelimits.ucl.new",
- RSPAMD_DBDIR);
+ RSPAMD_DBDIR);
FILE *f = fopen(path, "w");
if (f != NULL) {
@@ -2307,7 +2300,7 @@ rspamd_fuzzy_maybe_save_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
while ((it = rspamd_lru_hash_foreach(ctx->ratelimit_buckets, it, &k, &v)) != -1) {
ucl_object_t *cur = ucl_object_typed_new(UCL_OBJECT);
- struct rspamd_leaky_bucket_elt *elt = (struct rspamd_leaky_bucket_elt *)v;
+ struct rspamd_leaky_bucket_elt *elt = (struct rspamd_leaky_bucket_elt *) v;
ucl_object_insert_key(cur, ucl_object_fromdouble(elt->cur), "value", 0, false);
ucl_object_insert_key(cur, ucl_object_fromdouble(elt->last), "last", 0, false);
@@ -2320,7 +2313,7 @@ rspamd_fuzzy_maybe_save_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
fflush(f);
rspamd_snprintf(npath, sizeof(npath), "%s" G_DIR_SEPARATOR_S "fuzzy_ratelimits.ucl",
- RSPAMD_DBDIR);
+ RSPAMD_DBDIR);
if (rename(path, npath) == -1) {
msg_warn("cannot rename %s to %s: %s", path, npath, strerror(errno));
@@ -2342,110 +2335,110 @@ rspamd_fuzzy_maybe_save_ratelimits (struct rspamd_fuzzy_storage_ctx *ctx)
}
static int
-lua_fuzzy_add_pre_handler (lua_State *L)
+lua_fuzzy_add_pre_handler(lua_State *L)
{
struct rspamd_worker *wrk, **pwrk = (struct rspamd_worker **)
- rspamd_lua_check_udata (L, 1, "rspamd{worker}");
+ rspamd_lua_check_udata(L, 1, "rspamd{worker}");
struct rspamd_fuzzy_storage_ctx *ctx;
if (!pwrk) {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
wrk = *pwrk;
- if (wrk && lua_isfunction (L, 2)) {
- ctx = (struct rspamd_fuzzy_storage_ctx *)wrk->ctx;
+ if (wrk && lua_isfunction(L, 2)) {
+ ctx = (struct rspamd_fuzzy_storage_ctx *) wrk->ctx;
if (ctx->lua_pre_handler_cbref != -1) {
/* Should not happen */
- luaL_unref (L, LUA_REGISTRYINDEX, ctx->lua_pre_handler_cbref);
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->lua_pre_handler_cbref);
}
- lua_pushvalue (L, 2);
- ctx->lua_pre_handler_cbref = luaL_ref (L, LUA_REGISTRYINDEX);
+ lua_pushvalue(L, 2);
+ ctx->lua_pre_handler_cbref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
return 0;
}
static int
-lua_fuzzy_add_post_handler (lua_State *L)
+lua_fuzzy_add_post_handler(lua_State *L)
{
struct rspamd_worker *wrk, **pwrk = (struct rspamd_worker **)
- rspamd_lua_check_udata (L, 1, "rspamd{worker}");
+ rspamd_lua_check_udata(L, 1, "rspamd{worker}");
struct rspamd_fuzzy_storage_ctx *ctx;
if (!pwrk) {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
wrk = *pwrk;
- if (wrk && lua_isfunction (L, 2)) {
- ctx = (struct rspamd_fuzzy_storage_ctx *)wrk->ctx;
+ if (wrk && lua_isfunction(L, 2)) {
+ ctx = (struct rspamd_fuzzy_storage_ctx *) wrk->ctx;
if (ctx->lua_post_handler_cbref != -1) {
/* Should not happen */
- luaL_unref (L, LUA_REGISTRYINDEX, ctx->lua_post_handler_cbref);
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->lua_post_handler_cbref);
}
- lua_pushvalue (L, 2);
- ctx->lua_post_handler_cbref = luaL_ref (L, LUA_REGISTRYINDEX);
+ lua_pushvalue(L, 2);
+ ctx->lua_post_handler_cbref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
return 0;
}
static int
-lua_fuzzy_add_blacklist_handler (lua_State *L)
+lua_fuzzy_add_blacklist_handler(lua_State *L)
{
struct rspamd_worker *wrk, **pwrk = (struct rspamd_worker **)
- rspamd_lua_check_udata (L, 1, "rspamd{worker}");
+ rspamd_lua_check_udata(L, 1, "rspamd{worker}");
struct rspamd_fuzzy_storage_ctx *ctx;
if (!pwrk) {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
wrk = *pwrk;
- if (wrk && lua_isfunction (L, 2)) {
- ctx = (struct rspamd_fuzzy_storage_ctx *)wrk->ctx;
+ if (wrk && lua_isfunction(L, 2)) {
+ ctx = (struct rspamd_fuzzy_storage_ctx *) wrk->ctx;
if (ctx->lua_blacklist_cbref != -1) {
/* Should not happen */
- luaL_unref (L, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
+ luaL_unref(L, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
}
- lua_pushvalue (L, 2);
- ctx->lua_blacklist_cbref = luaL_ref (L, LUA_REGISTRYINDEX);
+ lua_pushvalue(L, 2);
+ ctx->lua_blacklist_cbref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else {
- return luaL_error (L, "invalid arguments, worker + function are expected");
+ return luaL_error(L, "invalid arguments, worker + function are expected");
}
return 0;
}
static gboolean
-rspamd_fuzzy_storage_stat (struct rspamd_main *rspamd_main,
- struct rspamd_worker *worker, gint fd,
- gint attached_fd,
- struct rspamd_control_command *cmd,
- gpointer ud)
+rspamd_fuzzy_storage_stat(struct rspamd_main *rspamd_main,
+ struct rspamd_worker *worker, gint fd,
+ gint attached_fd,
+ struct rspamd_control_command *cmd,
+ gpointer ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
struct rspamd_control_reply rep;
ucl_object_t *obj;
struct ucl_emitter_functions *emit_subr;
- guchar fdspace[CMSG_SPACE(sizeof (int))];
+ guchar fdspace[CMSG_SPACE(sizeof(int))];
struct iovec iov;
struct msghdr msg;
struct cmsghdr *cmsg;
@@ -2453,88 +2446,88 @@ rspamd_fuzzy_storage_stat (struct rspamd_main *rspamd_main,
gint outfd = -1;
gchar tmppath[PATH_MAX];
- memset (&rep, 0, sizeof (rep));
+ memset(&rep, 0, sizeof(rep));
rep.type = RSPAMD_CONTROL_FUZZY_STAT;
- rspamd_snprintf (tmppath, sizeof (tmppath), "%s%c%s-XXXXXXXXXX",
- rspamd_main->cfg->temp_dir, G_DIR_SEPARATOR, "fuzzy-stat");
+ rspamd_snprintf(tmppath, sizeof(tmppath), "%s%c%s-XXXXXXXXXX",
+ rspamd_main->cfg->temp_dir, G_DIR_SEPARATOR, "fuzzy-stat");
- if ((outfd = mkstemp (tmppath)) == -1) {
+ if ((outfd = mkstemp(tmppath)) == -1) {
rep.reply.fuzzy_stat.status = errno;
- msg_info_main ("cannot make temporary stat file for fuzzy stat: %s",
- strerror (errno));
+ msg_info_main("cannot make temporary stat file for fuzzy stat: %s",
+ strerror(errno));
}
else {
rep.reply.fuzzy_stat.status = 0;
- memcpy (rep.reply.fuzzy_stat.storage_id,
- rspamd_fuzzy_backend_id (ctx->backend),
- sizeof (rep.reply.fuzzy_stat.storage_id));
+ memcpy(rep.reply.fuzzy_stat.storage_id,
+ rspamd_fuzzy_backend_id(ctx->backend),
+ sizeof(rep.reply.fuzzy_stat.storage_id));
- obj = rspamd_fuzzy_stat_to_ucl (ctx, TRUE);
- emit_subr = ucl_object_emit_fd_funcs (outfd);
- ucl_object_emit_full (obj, UCL_EMIT_JSON_COMPACT, emit_subr, NULL);
- ucl_object_emit_funcs_free (emit_subr);
- ucl_object_unref (obj);
+ obj = rspamd_fuzzy_stat_to_ucl(ctx, TRUE);
+ emit_subr = ucl_object_emit_fd_funcs(outfd);
+ ucl_object_emit_full(obj, UCL_EMIT_JSON_COMPACT, emit_subr, NULL);
+ ucl_object_emit_funcs_free(emit_subr);
+ ucl_object_unref(obj);
/* Rewind output file */
- close (outfd);
- outfd = open (tmppath, O_RDONLY);
- unlink (tmppath);
+ close(outfd);
+ outfd = open(tmppath, O_RDONLY);
+ unlink(tmppath);
}
/* Now we can send outfd and status message */
- memset (&msg, 0, sizeof (msg));
+ memset(&msg, 0, sizeof(msg));
/* Attach fd to the message */
if (outfd != -1) {
- memset (fdspace, 0, sizeof (fdspace));
+ memset(fdspace, 0, sizeof(fdspace));
msg.msg_control = fdspace;
- msg.msg_controllen = sizeof (fdspace);
- cmsg = CMSG_FIRSTHDR (&msg);
+ msg.msg_controllen = sizeof(fdspace);
+ cmsg = CMSG_FIRSTHDR(&msg);
if (cmsg) {
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
- cmsg->cmsg_len = CMSG_LEN (sizeof (int));
- memcpy (CMSG_DATA (cmsg), &outfd, sizeof (int));
+ cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+ memcpy(CMSG_DATA(cmsg), &outfd, sizeof(int));
}
}
iov.iov_base = &rep;
- iov.iov_len = sizeof (rep);
+ iov.iov_len = sizeof(rep);
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
- if (sendmsg (fd, &msg, 0) == -1) {
- msg_err_main ("cannot send fuzzy stat: %s", strerror (errno));
+ if (sendmsg(fd, &msg, 0) == -1) {
+ msg_err_main("cannot send fuzzy stat: %s", strerror(errno));
}
if (outfd != -1) {
- close (outfd);
+ close(outfd);
}
return TRUE;
}
static gboolean
-fuzzy_parse_ids (rspamd_mempool_t *pool,
- const ucl_object_t *obj,
- gpointer ud,
- struct rspamd_rcl_section *section,
- GError **err)
+fuzzy_parse_ids(rspamd_mempool_t *pool,
+ const ucl_object_t *obj,
+ gpointer ud,
+ struct rspamd_rcl_section *section,
+ GError **err)
{
- struct rspamd_rcl_struct_parser *pd = (struct rspamd_rcl_struct_parser *)ud;
- khash_t(fuzzy_key_ids_set) *target;
+ struct rspamd_rcl_struct_parser *pd = (struct rspamd_rcl_struct_parser *) ud;
+ khash_t(fuzzy_key_ids_set) * target;
- target = *(khash_t(fuzzy_key_ids_set) **)((gchar *)pd->user_struct + pd->offset);
+ target = *(khash_t(fuzzy_key_ids_set) **) ((gchar *) pd->user_struct + pd->offset);
- if (ucl_object_type (obj) == UCL_ARRAY) {
+ if (ucl_object_type(obj) == UCL_ARRAY) {
const ucl_object_t *cur;
ucl_object_iter_t it = NULL;
guint64 id;
- while ((cur = ucl_object_iterate (obj, &it, true)) != NULL) {
- if (ucl_object_toint_safe (cur, &id)) {
+ while ((cur = ucl_object_iterate(obj, &it, true)) != NULL) {
+ if (ucl_object_toint_safe(cur, &id)) {
int r;
kh_put(fuzzy_key_ids_set, target, id, &r);
@@ -2546,9 +2539,9 @@ fuzzy_parse_ids (rspamd_mempool_t *pool,
return TRUE;
}
- else if (ucl_object_type (obj) == UCL_INT) {
+ else if (ucl_object_type(obj) == UCL_INT) {
int r;
- kh_put(fuzzy_key_ids_set, target, ucl_object_toint (obj), &r);
+ kh_put(fuzzy_key_ids_set, target, ucl_object_toint(obj), &r);
return TRUE;
}
@@ -2557,11 +2550,11 @@ fuzzy_parse_ids (rspamd_mempool_t *pool,
}
static gboolean
-fuzzy_parse_keypair (rspamd_mempool_t *pool,
- const ucl_object_t *obj,
- gpointer ud,
- struct rspamd_rcl_section *section,
- GError **err)
+fuzzy_parse_keypair(rspamd_mempool_t *pool,
+ const ucl_object_t *obj,
+ gpointer ud,
+ struct rspamd_rcl_section *section,
+ GError **err)
{
struct rspamd_rcl_struct_parser *pd = ud;
struct rspamd_fuzzy_storage_ctx *ctx;
@@ -2574,14 +2567,13 @@ fuzzy_parse_keypair (rspamd_mempool_t *pool,
gboolean ret;
ctx = pd->user_struct;
- pd->offset = G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, default_keypair);
+ pd->offset = G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, default_keypair);
/*
* Single key
*/
- if (ucl_object_type (obj) == UCL_STRING || ucl_object_type (obj)
- == UCL_OBJECT) {
- ret = rspamd_rcl_parse_struct_keypair (pool, obj, pd, section, err);
+ if (ucl_object_type(obj) == UCL_STRING || ucl_object_type(obj) == UCL_OBJECT) {
+ ret = rspamd_rcl_parse_struct_keypair(pool, obj, pd, section, err);
if (!ret) {
return ret;
@@ -2594,39 +2586,39 @@ fuzzy_parse_keypair (rspamd_mempool_t *pool,
return FALSE;
}
- if (rspamd_keypair_alg (kp) != RSPAMD_CRYPTOBOX_MODE_25519 ||
- rspamd_keypair_type (kp) != RSPAMD_KEYPAIR_KEX) {
+ if (rspamd_keypair_alg(kp) != RSPAMD_CRYPTOBOX_MODE_25519 ||
+ rspamd_keypair_type(kp) != RSPAMD_KEYPAIR_KEX) {
return FALSE;
}
- key = g_malloc0 (sizeof (*key));
+ key = g_malloc0(sizeof(*key));
key->key = kp;
- keystat = g_malloc0 (sizeof (*keystat));
- REF_INIT_RETAIN (keystat, fuzzy_key_stat_dtor);
+ keystat = g_malloc0(sizeof(*keystat));
+ REF_INIT_RETAIN(keystat, fuzzy_key_stat_dtor);
/* Hash of ip -> fuzzy_key_stat */
- keystat->last_ips = rspamd_lru_hash_new_full (1024,
- (GDestroyNotify) rspamd_inet_address_free,
- fuzzy_key_stat_unref,
- rspamd_inet_address_hash, rspamd_inet_address_equal);
+ keystat->last_ips = rspamd_lru_hash_new_full(1024,
+ (GDestroyNotify) rspamd_inet_address_free,
+ fuzzy_key_stat_unref,
+ rspamd_inet_address_hash, rspamd_inet_address_equal);
key->stat = keystat;
key->flags_stat = kh_init(fuzzy_key_flag_stat);
/* Preallocate some space for flags */
kh_resize(fuzzy_key_flag_stat, key->flags_stat, 8);
- pk = rspamd_keypair_component (kp, RSPAMD_KEYPAIR_COMPONENT_PK,
- NULL);
+ pk = rspamd_keypair_component(kp, RSPAMD_KEYPAIR_COMPONENT_PK,
+ NULL);
keystat->keypair = rspamd_keypair_ref(kp);
/* We map entries by pubkey in binary form for faster lookup */
- g_hash_table_insert (ctx->keys, (gpointer)pk, key);
+ g_hash_table_insert(ctx->keys, (gpointer) pk, key);
ctx->default_key = key;
const ucl_object_t *extensions = rspamd_keypair_get_extensions(kp);
if (extensions) {
- const ucl_object_t *forbidden_ids = ucl_object_lookup (extensions, "forbidden_ids");
+ const ucl_object_t *forbidden_ids = ucl_object_lookup(extensions, "forbidden_ids");
- if (forbidden_ids && ucl_object_type (forbidden_ids) == UCL_ARRAY) {
+ if (forbidden_ids && ucl_object_type(forbidden_ids) == UCL_ARRAY) {
key->forbidden_ids = kh_init(fuzzy_key_ids_set);
- while ((cur = ucl_object_iterate (forbidden_ids, &it, true)) != NULL) {
+ while ((cur = ucl_object_iterate(forbidden_ids, &it, true)) != NULL) {
if (ucl_object_type(cur) == UCL_INT || ucl_object_type(cur) == UCL_FLOAT) {
int id = ucl_object_toint(cur);
int r;
@@ -2639,10 +2631,10 @@ fuzzy_parse_keypair (rspamd_mempool_t *pool,
msg_debug_pool_check("loaded keypair %*xs", 8, pk);
}
- else if (ucl_object_type (obj) == UCL_ARRAY) {
- while ((cur = ucl_object_iterate (obj, &it, true)) != NULL) {
- if (!fuzzy_parse_keypair (pool, cur, pd, section, err)) {
- msg_err_pool ("cannot parse keypair");
+ else if (ucl_object_type(obj) == UCL_ARRAY) {
+ while ((cur = ucl_object_iterate(obj, &it, true)) != NULL) {
+ if (!fuzzy_parse_keypair(pool, cur, pd, section, err)) {
+ msg_err_pool("cannot parse keypair");
}
}
}
@@ -2651,29 +2643,29 @@ fuzzy_parse_keypair (rspamd_mempool_t *pool,
}
static guint
-fuzzy_kp_hash (gconstpointer p)
+fuzzy_kp_hash(gconstpointer p)
{
- return *(guint *)p;
+ return *(guint *) p;
}
static gboolean
-fuzzy_kp_equal (gconstpointer a, gconstpointer b)
+fuzzy_kp_equal(gconstpointer a, gconstpointer b)
{
const guchar *pa = a, *pb = b;
- return (memcmp (pa, pb, RSPAMD_FUZZY_KEYLEN) == 0);
+ return (memcmp(pa, pb, RSPAMD_FUZZY_KEYLEN) == 0);
}
gpointer
-init_fuzzy (struct rspamd_config *cfg)
+init_fuzzy(struct rspamd_config *cfg)
{
struct rspamd_fuzzy_storage_ctx *ctx;
GQuark type;
- type = g_quark_try_string ("fuzzy");
+ type = g_quark_try_string("fuzzy");
- ctx = rspamd_mempool_alloc0 (cfg->cfg_pool,
- sizeof (struct rspamd_fuzzy_storage_ctx));
+ ctx = rspamd_mempool_alloc0(cfg->cfg_pool,
+ sizeof(struct rspamd_fuzzy_storage_ctx));
ctx->magic = rspamd_fuzzy_storage_magic;
ctx->sync_timeout = DEFAULT_SYNC_TIMEOUT;
@@ -2681,15 +2673,15 @@ init_fuzzy (struct rspamd_config *cfg)
ctx->lua_pre_handler_cbref = -1;
ctx->lua_post_handler_cbref = -1;
ctx->lua_blacklist_cbref = -1;
- ctx->keys = g_hash_table_new_full (fuzzy_kp_hash, fuzzy_kp_equal,
- NULL, fuzzy_key_dtor);
- rspamd_mempool_add_destructor (cfg->cfg_pool,
- (rspamd_mempool_destruct_t)g_hash_table_unref, ctx->keys);
- ctx->errors_ips = rspamd_lru_hash_new_full (1024,
- (GDestroyNotify) rspamd_inet_address_free, g_free,
- rspamd_inet_address_hash, rspamd_inet_address_equal);
- rspamd_mempool_add_destructor (cfg->cfg_pool,
- (rspamd_mempool_destruct_t)rspamd_lru_hash_destroy, ctx->errors_ips);
+ ctx->keys = g_hash_table_new_full(fuzzy_kp_hash, fuzzy_kp_equal,
+ NULL, fuzzy_key_dtor);
+ rspamd_mempool_add_destructor(cfg->cfg_pool,
+ (rspamd_mempool_destruct_t) g_hash_table_unref, ctx->keys);
+ ctx->errors_ips = rspamd_lru_hash_new_full(1024,
+ (GDestroyNotify) rspamd_inet_address_free, g_free,
+ rspamd_inet_address_hash, rspamd_inet_address_equal);
+ rspamd_mempool_add_destructor(cfg->cfg_pool,
+ (rspamd_mempool_destruct_t) rspamd_lru_hash_destroy, ctx->errors_ips);
ctx->cfg = cfg;
ctx->updates_maxfail = DEFAULT_UPDATES_MAXFAIL;
ctx->leaky_bucket_mask = DEFAULT_BUCKET_MASK;
@@ -2701,250 +2693,247 @@ init_fuzzy (struct rspamd_config *cfg)
ctx->default_forbidden_ids = kh_init(fuzzy_key_ids_set);
ctx->weak_ids = kh_init(fuzzy_key_ids_set);
- rspamd_rcl_register_worker_option (cfg,
- type,
- "sync",
- rspamd_rcl_parse_struct_time,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx,
- sync_timeout),
- RSPAMD_CL_FLAG_TIME_FLOAT,
- "Time to perform database sync, default: "
- G_STRINGIFY (DEFAULT_SYNC_TIMEOUT) " seconds");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "expire",
- rspamd_rcl_parse_struct_time,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx,
- expire),
- RSPAMD_CL_FLAG_TIME_FLOAT,
- "Default expire time for hashes, default: "
- G_STRINGIFY (DEFAULT_EXPIRE) " seconds");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "delay",
- rspamd_rcl_parse_struct_time,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx,
- delay),
- RSPAMD_CL_FLAG_TIME_FLOAT,
- "Default delay time for hashes, default: not enabled");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "allow_update",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, update_map),
- 0,
- "Allow modifications from the following IP addresses");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "allow_update_keys",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, update_keys_map),
- 0,
- "Allow modifications for those using specific public keys");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "delay_whitelist",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, delay_whitelist_map),
- 0,
- "Disable delay check for the following IP addresses");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "keypair",
- fuzzy_parse_keypair,
- ctx,
- 0,
- RSPAMD_CL_FLAG_MULTIPLE,
- "Encryption keypair (can be repeated for different keys)");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "forbidden_ids",
- fuzzy_parse_ids,
- ctx,
- G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, default_forbidden_ids),
- 0,
- "Deny specific flags by default");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "weak_ids",
- fuzzy_parse_ids,
- ctx,
- G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, weak_ids),
- 0,
- "Treat these flags as weak (i.e. they do not overwrite strong flags)");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "keypair_cache_size",
- rspamd_rcl_parse_struct_integer,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx,
- keypair_cache_size),
- RSPAMD_CL_FLAG_UINT,
- "Size of keypairs cache, default: "
- G_STRINGIFY (DEFAULT_KEYPAIR_CACHE_SIZE));
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "encrypted_only",
- rspamd_rcl_parse_struct_boolean,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, encrypted_only),
- 0,
- "Allow encrypted requests only (and forbid all unknown keys or plaintext requests)");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "dedicated_update_worker",
- rspamd_rcl_parse_struct_boolean,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, dedicated_update_worker),
- 0,
- "Use worker 0 for updates only");
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "read_only",
- rspamd_rcl_parse_struct_boolean,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, read_only),
- 0,
- "Work in read only mode");
-
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "blocked",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, blocked_map),
- 0,
- "Block requests from specific networks");
-
-
- rspamd_rcl_register_worker_option (cfg,
- type,
- "updates_maxfail",
- rspamd_rcl_parse_struct_integer,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, updates_maxfail),
- RSPAMD_CL_FLAG_UINT,
- "Maximum number of updates to be failed before discarding");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "skip_hashes",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, skip_map),
- 0,
- "Skip specific hashes from the map");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "sync",
+ rspamd_rcl_parse_struct_time,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx,
+ sync_timeout),
+ RSPAMD_CL_FLAG_TIME_FLOAT,
+ "Time to perform database sync, default: " G_STRINGIFY(DEFAULT_SYNC_TIMEOUT) " seconds");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "expire",
+ rspamd_rcl_parse_struct_time,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx,
+ expire),
+ RSPAMD_CL_FLAG_TIME_FLOAT,
+ "Default expire time for hashes, default: " G_STRINGIFY(DEFAULT_EXPIRE) " seconds");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "delay",
+ rspamd_rcl_parse_struct_time,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx,
+ delay),
+ RSPAMD_CL_FLAG_TIME_FLOAT,
+ "Default delay time for hashes, default: not enabled");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "allow_update",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, update_map),
+ 0,
+ "Allow modifications from the following IP addresses");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "allow_update_keys",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, update_keys_map),
+ 0,
+ "Allow modifications for those using specific public keys");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "delay_whitelist",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, delay_whitelist_map),
+ 0,
+ "Disable delay check for the following IP addresses");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "keypair",
+ fuzzy_parse_keypair,
+ ctx,
+ 0,
+ RSPAMD_CL_FLAG_MULTIPLE,
+ "Encryption keypair (can be repeated for different keys)");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "forbidden_ids",
+ fuzzy_parse_ids,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, default_forbidden_ids),
+ 0,
+ "Deny specific flags by default");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "weak_ids",
+ fuzzy_parse_ids,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, weak_ids),
+ 0,
+ "Treat these flags as weak (i.e. they do not overwrite strong flags)");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "keypair_cache_size",
+ rspamd_rcl_parse_struct_integer,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx,
+ keypair_cache_size),
+ RSPAMD_CL_FLAG_UINT,
+ "Size of keypairs cache, default: " G_STRINGIFY(DEFAULT_KEYPAIR_CACHE_SIZE));
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "encrypted_only",
+ rspamd_rcl_parse_struct_boolean,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, encrypted_only),
+ 0,
+ "Allow encrypted requests only (and forbid all unknown keys or plaintext requests)");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "dedicated_update_worker",
+ rspamd_rcl_parse_struct_boolean,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, dedicated_update_worker),
+ 0,
+ "Use worker 0 for updates only");
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "read_only",
+ rspamd_rcl_parse_struct_boolean,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, read_only),
+ 0,
+ "Work in read only mode");
+
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "blocked",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, blocked_map),
+ 0,
+ "Block requests from specific networks");
+
+
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "updates_maxfail",
+ rspamd_rcl_parse_struct_integer,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, updates_maxfail),
+ RSPAMD_CL_FLAG_UINT,
+ "Maximum number of updates to be failed before discarding");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "skip_hashes",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, skip_map),
+ 0,
+ "Skip specific hashes from the map");
/* Ratelimits */
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_whitelist",
- rspamd_rcl_parse_struct_ucl,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, ratelimit_whitelist_map),
- 0,
- "Skip specific addresses from rate limiting");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_max_buckets",
- rspamd_rcl_parse_struct_integer,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, max_buckets),
- RSPAMD_CL_FLAG_UINT,
- "Maximum number of leaky buckets (default: " G_STRINGIFY(DEFAULT_MAX_BUCKETS) ")");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_network_mask",
- rspamd_rcl_parse_struct_integer,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, leaky_bucket_mask),
- RSPAMD_CL_FLAG_UINT,
- "Network mask to apply for IPv4 rate addresses (default: " G_STRINGIFY(DEFAULT_BUCKET_MASK) ")");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_bucket_ttl",
- rspamd_rcl_parse_struct_time,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, leaky_bucket_ttl),
- RSPAMD_CL_FLAG_TIME_INTEGER,
- "Time to live for ratelimit element (default: " G_STRINGIFY(DEFAULT_BUCKET_TTL) ")");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_rate",
- rspamd_rcl_parse_struct_double,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, leaky_bucket_rate),
- 0,
- "Leak rate in requests per second");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_burst",
- rspamd_rcl_parse_struct_double,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, leaky_bucket_burst),
- 0,
- "Peak value for ratelimit bucket");
- rspamd_rcl_register_worker_option (cfg,
- type,
- "ratelimit_log_only",
- rspamd_rcl_parse_struct_boolean,
- ctx,
- G_STRUCT_OFFSET (struct rspamd_fuzzy_storage_ctx, ratelimit_log_only),
- 0,
- "Don't really ban on ratelimit reaching, just log");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_whitelist",
+ rspamd_rcl_parse_struct_ucl,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, ratelimit_whitelist_map),
+ 0,
+ "Skip specific addresses from rate limiting");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_max_buckets",
+ rspamd_rcl_parse_struct_integer,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, max_buckets),
+ RSPAMD_CL_FLAG_UINT,
+ "Maximum number of leaky buckets (default: " G_STRINGIFY(DEFAULT_MAX_BUCKETS) ")");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_network_mask",
+ rspamd_rcl_parse_struct_integer,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, leaky_bucket_mask),
+ RSPAMD_CL_FLAG_UINT,
+ "Network mask to apply for IPv4 rate addresses (default: " G_STRINGIFY(DEFAULT_BUCKET_MASK) ")");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_bucket_ttl",
+ rspamd_rcl_parse_struct_time,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, leaky_bucket_ttl),
+ RSPAMD_CL_FLAG_TIME_INTEGER,
+ "Time to live for ratelimit element (default: " G_STRINGIFY(DEFAULT_BUCKET_TTL) ")");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_rate",
+ rspamd_rcl_parse_struct_double,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, leaky_bucket_rate),
+ 0,
+ "Leak rate in requests per second");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_burst",
+ rspamd_rcl_parse_struct_double,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, leaky_bucket_burst),
+ 0,
+ "Peak value for ratelimit bucket");
+ rspamd_rcl_register_worker_option(cfg,
+ type,
+ "ratelimit_log_only",
+ rspamd_rcl_parse_struct_boolean,
+ ctx,
+ G_STRUCT_OFFSET(struct rspamd_fuzzy_storage_ctx, ratelimit_log_only),
+ 0,
+ "Don't really ban on ratelimit reaching, just log");
return ctx;
}
static void
-rspamd_fuzzy_peer_io (EV_P_ ev_io *w, int revents)
+rspamd_fuzzy_peer_io(EV_P_ ev_io *w, int revents)
{
struct fuzzy_peer_cmd cmd;
struct rspamd_fuzzy_storage_ctx *ctx =
- (struct rspamd_fuzzy_storage_ctx *)w->data;
+ (struct rspamd_fuzzy_storage_ctx *) w->data;
gssize r;
for (;;) {
- r = read (w->fd, &cmd, sizeof (cmd));
+ r = read(w->fd, &cmd, sizeof(cmd));
- if (r != sizeof (cmd)) {
+ if (r != sizeof(cmd)) {
if (errno == EINTR) {
continue;
}
if (errno != EAGAIN) {
- msg_err ("cannot read command from peers: %s", strerror (errno));
+ msg_err("cannot read command from peers: %s", strerror(errno));
}
break;
}
else {
- g_array_append_val (ctx->updates_pending, cmd);
+ g_array_append_val(ctx->updates_pending, cmd);
}
}
}
static void
-fuzzy_peer_rep (struct rspamd_worker *worker,
- struct rspamd_srv_reply *rep, gint rep_fd,
- gpointer ud)
+fuzzy_peer_rep(struct rspamd_worker *worker,
+ struct rspamd_srv_reply *rep, gint rep_fd,
+ gpointer ud)
{
struct rspamd_fuzzy_storage_ctx *ctx = ud;
GList *cur;
@@ -2954,14 +2943,14 @@ fuzzy_peer_rep (struct rspamd_worker *worker,
ctx->peer_fd = rep_fd;
if (rep_fd == -1) {
- msg_err ("cannot receive peer fd from the main process");
- exit (EXIT_FAILURE);
+ msg_err("cannot receive peer fd from the main process");
+ exit(EXIT_FAILURE);
}
else {
- rspamd_socket_nonblocking (rep_fd);
+ rspamd_socket_nonblocking(rep_fd);
}
- msg_info ("got peer fd reply from the main process");
+ msg_info("got peer fd reply from the main process");
/* Start listening */
cur = worker->cf->listen_socks;
@@ -2969,37 +2958,37 @@ fuzzy_peer_rep (struct rspamd_worker *worker,
ls = cur->data;
if (ls->fd != -1) {
- msg_info ("start listening on %s",
- rspamd_inet_address_to_string_pretty (ls->addr));
+ msg_info("start listening on %s",
+ rspamd_inet_address_to_string_pretty(ls->addr));
if (ls->type == RSPAMD_WORKER_SOCKET_UDP) {
- ac_ev = g_malloc0 (sizeof (*ac_ev));
+ ac_ev = g_malloc0(sizeof(*ac_ev));
ac_ev->accept_ev.data = worker;
ac_ev->event_loop = ctx->event_loop;
- ev_io_init (&ac_ev->accept_ev, accept_fuzzy_socket, ls->fd,
- EV_READ);
- ev_io_start (ctx->event_loop, &ac_ev->accept_ev);
- DL_APPEND (worker->accept_events, ac_ev);
+ ev_io_init(&ac_ev->accept_ev, accept_fuzzy_socket, ls->fd,
+ EV_READ);
+ ev_io_start(ctx->event_loop, &ac_ev->accept_ev);
+ DL_APPEND(worker->accept_events, ac_ev);
}
- else {
+ else {
/* We allow TCP listeners only for a update worker */
- g_assert_not_reached ();
+ g_assert_not_reached();
}
}
- cur = g_list_next (cur);
+ cur = g_list_next(cur);
}
if (ctx->peer_fd != -1) {
if (worker->index == 0) {
/* Listen for peer requests */
- shutdown (ctx->peer_fd, SHUT_WR);
+ shutdown(ctx->peer_fd, SHUT_WR);
ctx->peer_ev.data = ctx;
- ev_io_init (&ctx->peer_ev, rspamd_fuzzy_peer_io, ctx->peer_fd, EV_READ);
- ev_io_start (ctx->event_loop, &ctx->peer_ev);
+ ev_io_init(&ctx->peer_ev, rspamd_fuzzy_peer_io, ctx->peer_fd, EV_READ);
+ ev_io_start(ctx->event_loop, &ctx->peer_ev);
}
else {
- shutdown (ctx->peer_fd, SHUT_RD);
+ shutdown(ctx->peer_fd, SHUT_RD);
}
}
}
@@ -3007,106 +2996,105 @@ fuzzy_peer_rep (struct rspamd_worker *worker,
/*
* Start worker process
*/
-__attribute__((noreturn))
-void
-start_fuzzy (struct rspamd_worker *worker)
+__attribute__((noreturn)) void
+start_fuzzy(struct rspamd_worker *worker)
{
struct rspamd_fuzzy_storage_ctx *ctx = worker->ctx;
GError *err = NULL;
struct rspamd_srv_command srv_cmd;
struct rspamd_config *cfg = worker->srv->cfg;
- g_assert (rspamd_worker_check_context (worker->ctx, rspamd_fuzzy_storage_magic));
- ctx->event_loop = rspamd_prepare_worker (worker,
- "fuzzy",
- NULL);
+ g_assert(rspamd_worker_check_context(worker->ctx, rspamd_fuzzy_storage_magic));
+ ctx->event_loop = rspamd_prepare_worker(worker,
+ "fuzzy",
+ NULL);
ctx->peer_fd = -1;
ctx->worker = worker;
ctx->cfg = worker->srv->cfg;
- ctx->resolver = rspamd_dns_resolver_init (worker->srv->logger,
- ctx->event_loop,
- worker->srv->cfg);
- rspamd_upstreams_library_config (worker->srv->cfg, ctx->cfg->ups_ctx,
- ctx->event_loop, ctx->resolver->r);
+ ctx->resolver = rspamd_dns_resolver_init(worker->srv->logger,
+ ctx->event_loop,
+ worker->srv->cfg);
+ rspamd_upstreams_library_config(worker->srv->cfg, ctx->cfg->ups_ctx,
+ ctx->event_loop, ctx->resolver->r);
/* Since this worker uses maps it needs a valid HTTP context */
- ctx->http_ctx = rspamd_http_context_create (ctx->cfg, ctx->event_loop,
- ctx->cfg->ups_ctx);
+ ctx->http_ctx = rspamd_http_context_create(ctx->cfg, ctx->event_loop,
+ ctx->cfg->ups_ctx);
if (ctx->keypair_cache_size > 0) {
/* Create keypairs cache */
- ctx->keypair_cache = rspamd_keypair_cache_new (ctx->keypair_cache_size);
+ ctx->keypair_cache = rspamd_keypair_cache_new(ctx->keypair_cache_size);
}
- if ((ctx->backend = rspamd_fuzzy_backend_create (ctx->event_loop,
- worker->cf->options, cfg, &err)) == NULL) {
- msg_err ("cannot open backend: %e", err);
+ if ((ctx->backend = rspamd_fuzzy_backend_create(ctx->event_loop,
+ worker->cf->options, cfg, &err)) == NULL) {
+ msg_err("cannot open backend: %e", err);
if (err) {
- g_error_free (err);
+ g_error_free(err);
}
- exit (EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}
- rspamd_fuzzy_backend_count (ctx->backend, fuzzy_count_callback, ctx);
+ rspamd_fuzzy_backend_count(ctx->backend, fuzzy_count_callback, ctx);
if (worker->index == 0) {
- ctx->updates_pending = g_array_sized_new (FALSE, FALSE,
- sizeof (struct fuzzy_peer_cmd), 1024);
- rspamd_fuzzy_backend_start_update (ctx->backend, ctx->sync_timeout,
- rspamd_fuzzy_storage_periodic_callback, ctx);
+ ctx->updates_pending = g_array_sized_new(FALSE, FALSE,
+ sizeof(struct fuzzy_peer_cmd), 1024);
+ rspamd_fuzzy_backend_start_update(ctx->backend, ctx->sync_timeout,
+ rspamd_fuzzy_storage_periodic_callback, ctx);
if (ctx->dedicated_update_worker && worker->cf->count > 1) {
- msg_info_config ("stop serving clients request in dedicated update mode");
- rspamd_worker_stop_accept (worker);
+ msg_info_config("stop serving clients request in dedicated update mode");
+ rspamd_worker_stop_accept(worker);
GList *cur = worker->cf->listen_socks;
while (cur) {
struct rspamd_worker_listen_socket *ls =
- (struct rspamd_worker_listen_socket *)cur->data;
+ (struct rspamd_worker_listen_socket *) cur->data;
if (ls->fd != -1) {
- close (ls->fd);
+ close(ls->fd);
}
- cur = g_list_next (cur);
+ cur = g_list_next(cur);
}
}
}
ctx->stat_ev.data = ctx;
- ev_timer_init (&ctx->stat_ev, rspamd_fuzzy_stat_callback, ctx->sync_timeout,
- ctx->sync_timeout);
- ev_timer_start (ctx->event_loop, &ctx->stat_ev);
+ ev_timer_init(&ctx->stat_ev, rspamd_fuzzy_stat_callback, ctx->sync_timeout,
+ ctx->sync_timeout);
+ ev_timer_start(ctx->event_loop, &ctx->stat_ev);
/* Register custom reload and stat commands for the control socket */
- rspamd_control_worker_add_cmd_handler (worker, RSPAMD_CONTROL_RELOAD,
- rspamd_fuzzy_storage_reload, ctx);
- rspamd_control_worker_add_cmd_handler (worker, RSPAMD_CONTROL_FUZZY_STAT,
- rspamd_fuzzy_storage_stat, ctx);
- rspamd_control_worker_add_cmd_handler (worker, RSPAMD_CONTROL_FUZZY_SYNC,
- rspamd_fuzzy_storage_sync, ctx);
- rspamd_control_worker_add_cmd_handler (worker, RSPAMD_CONTROL_FUZZY_BLOCKED,
- rspamd_fuzzy_control_blocked, ctx);
+ rspamd_control_worker_add_cmd_handler(worker, RSPAMD_CONTROL_RELOAD,
+ rspamd_fuzzy_storage_reload, ctx);
+ rspamd_control_worker_add_cmd_handler(worker, RSPAMD_CONTROL_FUZZY_STAT,
+ rspamd_fuzzy_storage_stat, ctx);
+ rspamd_control_worker_add_cmd_handler(worker, RSPAMD_CONTROL_FUZZY_SYNC,
+ rspamd_fuzzy_storage_sync, ctx);
+ rspamd_control_worker_add_cmd_handler(worker, RSPAMD_CONTROL_FUZZY_BLOCKED,
+ rspamd_fuzzy_control_blocked, ctx);
if (ctx->update_map != NULL) {
- rspamd_config_radix_from_ucl (worker->srv->cfg, ctx->update_map,
- "Allow fuzzy updates from specified addresses",
- &ctx->update_ips, NULL, worker, "fuzzy update");
+ rspamd_config_radix_from_ucl(worker->srv->cfg, ctx->update_map,
+ "Allow fuzzy updates from specified addresses",
+ &ctx->update_ips, NULL, worker, "fuzzy update");
}
if (ctx->update_keys_map != NULL) {
struct rspamd_map *m;
- if ((m = rspamd_map_add_from_ucl (worker->srv->cfg, ctx->update_keys_map,
- "Allow fuzzy updates from specified public keys",
- rspamd_kv_list_read,
- rspamd_kv_list_fin,
- rspamd_kv_list_dtor,
- (void **)&ctx->update_keys, worker, RSPAMD_MAP_DEFAULT)) == NULL) {
- msg_warn_config ("cannot load allow keys map from %s",
- ucl_object_tostring (ctx->update_keys_map));
+ if ((m = rspamd_map_add_from_ucl(worker->srv->cfg, ctx->update_keys_map,
+ "Allow fuzzy updates from specified public keys",
+ rspamd_kv_list_read,
+ rspamd_kv_list_fin,
+ rspamd_kv_list_dtor,
+ (void **) &ctx->update_keys, worker, RSPAMD_MAP_DEFAULT)) == NULL) {
+ msg_warn_config("cannot load allow keys map from %s",
+ ucl_object_tostring(ctx->update_keys_map));
}
else {
m->active_http = TRUE;
@@ -3116,15 +3104,15 @@ start_fuzzy (struct rspamd_worker *worker)
if (ctx->skip_map != NULL) {
struct rspamd_map *m;
- if ((m = rspamd_map_add_from_ucl (cfg, ctx->skip_map,
- "Skip hashes",
- rspamd_kv_list_read,
- rspamd_kv_list_fin,
- rspamd_kv_list_dtor,
- (void **)&ctx->skip_hashes,
- worker, RSPAMD_MAP_DEFAULT)) == NULL) {
- msg_warn_config ("cannot load hashes list from %s",
- ucl_object_tostring (ctx->skip_map));
+ if ((m = rspamd_map_add_from_ucl(cfg, ctx->skip_map,
+ "Skip hashes",
+ rspamd_kv_list_read,
+ rspamd_kv_list_fin,
+ rspamd_kv_list_dtor,
+ (void **) &ctx->skip_hashes,
+ worker, RSPAMD_MAP_DEFAULT)) == NULL) {
+ msg_warn_config("cannot load hashes list from %s",
+ ucl_object_tostring(ctx->skip_map));
}
else {
m->active_http = TRUE;
@@ -3132,146 +3120,146 @@ start_fuzzy (struct rspamd_worker *worker)
}
if (ctx->blocked_map != NULL) {
- rspamd_config_radix_from_ucl (worker->srv->cfg, ctx->blocked_map,
- "Block fuzzy requests from the specific IPs",
- &ctx->blocked_ips,
- NULL,
- worker, "fuzzy blocked");
+ rspamd_config_radix_from_ucl(worker->srv->cfg, ctx->blocked_map,
+ "Block fuzzy requests from the specific IPs",
+ &ctx->blocked_ips,
+ NULL,
+ worker, "fuzzy blocked");
}
/* Create radix trees */
if (ctx->ratelimit_whitelist_map != NULL) {
- rspamd_config_radix_from_ucl (worker->srv->cfg, ctx->ratelimit_whitelist_map,
- "Skip ratelimits from specific ip addresses/networks",
- &ctx->ratelimit_whitelist,
- NULL,
- worker, "fuzzy ratelimit whitelist");
+ rspamd_config_radix_from_ucl(worker->srv->cfg, ctx->ratelimit_whitelist_map,
+ "Skip ratelimits from specific ip addresses/networks",
+ &ctx->ratelimit_whitelist,
+ NULL,
+ worker, "fuzzy ratelimit whitelist");
}
- if (!isnan (ctx->delay) && ctx->delay_whitelist_map != NULL) {
- rspamd_config_radix_from_ucl (worker->srv->cfg, ctx->delay_whitelist_map,
- "Skip delay from the following ips",
- &ctx->delay_whitelist, NULL, worker,
- "fuzzy delayed whitelist");
+ if (!isnan(ctx->delay) && ctx->delay_whitelist_map != NULL) {
+ rspamd_config_radix_from_ucl(worker->srv->cfg, ctx->delay_whitelist_map,
+ "Skip delay from the following ips",
+ &ctx->delay_whitelist, NULL, worker,
+ "fuzzy delayed whitelist");
}
/* Ratelimits */
- if (!isnan (ctx->leaky_bucket_rate) && !isnan (ctx->leaky_bucket_burst)) {
- ctx->ratelimit_buckets = rspamd_lru_hash_new_full (ctx->max_buckets,
- NULL, fuzzy_rl_bucket_free,
- rspamd_inet_address_hash, rspamd_inet_address_equal);
+ if (!isnan(ctx->leaky_bucket_rate) && !isnan(ctx->leaky_bucket_burst)) {
+ ctx->ratelimit_buckets = rspamd_lru_hash_new_full(ctx->max_buckets,
+ NULL, fuzzy_rl_bucket_free,
+ rspamd_inet_address_hash, rspamd_inet_address_equal);
- rspamd_fuzzy_maybe_load_ratelimits (ctx);
+ rspamd_fuzzy_maybe_load_ratelimits(ctx);
}
/* Maps events */
- ctx->resolver = rspamd_dns_resolver_init (worker->srv->logger,
- ctx->event_loop,
- worker->srv->cfg);
- rspamd_map_watch (worker->srv->cfg, ctx->event_loop,
- ctx->resolver, worker, RSPAMD_MAP_WATCH_WORKER);
+ ctx->resolver = rspamd_dns_resolver_init(worker->srv->logger,
+ ctx->event_loop,
+ worker->srv->cfg);
+ rspamd_map_watch(worker->srv->cfg, ctx->event_loop,
+ ctx->resolver, worker, RSPAMD_MAP_WATCH_WORKER);
/* Get peer pipe */
- memset (&srv_cmd, 0, sizeof (srv_cmd));
+ memset(&srv_cmd, 0, sizeof(srv_cmd));
srv_cmd.type = RSPAMD_SRV_SOCKETPAIR;
srv_cmd.cmd.spair.af = SOCK_DGRAM;
srv_cmd.cmd.spair.pair_num = worker->index;
- memset (srv_cmd.cmd.spair.pair_id, 0, sizeof (srv_cmd.cmd.spair.pair_id));
+ memset(srv_cmd.cmd.spair.pair_id, 0, sizeof(srv_cmd.cmd.spair.pair_id));
/* 6 bytes of id (including \0) and bind_conf id */
- G_STATIC_ASSERT (sizeof (srv_cmd.cmd.spair.pair_id) >=
- sizeof ("fuzzy") + sizeof (guint64));
+ G_STATIC_ASSERT(sizeof(srv_cmd.cmd.spair.pair_id) >=
+ sizeof("fuzzy") + sizeof(guint64));
- memcpy (srv_cmd.cmd.spair.pair_id, "fuzzy", sizeof ("fuzzy"));
+ memcpy(srv_cmd.cmd.spair.pair_id, "fuzzy", sizeof("fuzzy"));
/* Distinguish workers from each others... */
if (worker->cf->bind_conf && worker->cf->bind_conf->bind_line) {
- guint64 bind_hash = rspamd_cryptobox_fast_hash (worker->cf->bind_conf->bind_line,
- strlen (worker->cf->bind_conf->bind_line), 0xdeadbabe);
+ guint64 bind_hash = rspamd_cryptobox_fast_hash(worker->cf->bind_conf->bind_line,
+ strlen(worker->cf->bind_conf->bind_line), 0xdeadbabe);
/* 8 more bytes */
- memcpy (srv_cmd.cmd.spair.pair_id + sizeof ("fuzzy"), &bind_hash,
- sizeof (bind_hash));
+ memcpy(srv_cmd.cmd.spair.pair_id + sizeof("fuzzy"), &bind_hash,
+ sizeof(bind_hash));
}
- rspamd_srv_send_command (worker, ctx->event_loop, &srv_cmd, -1,
- fuzzy_peer_rep, ctx);
+ rspamd_srv_send_command(worker, ctx->event_loop, &srv_cmd, -1,
+ fuzzy_peer_rep, ctx);
/*
* Extra fields available for this particular worker
*/
luaL_Reg fuzzy_lua_reg = {
- .name = "add_fuzzy_pre_handler",
- .func = lua_fuzzy_add_pre_handler,
+ .name = "add_fuzzy_pre_handler",
+ .func = lua_fuzzy_add_pre_handler,
};
- rspamd_lua_add_metamethod (ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
+ rspamd_lua_add_metamethod(ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
fuzzy_lua_reg = (luaL_Reg){
- .name = "add_fuzzy_post_handler",
- .func = lua_fuzzy_add_post_handler,
+ .name = "add_fuzzy_post_handler",
+ .func = lua_fuzzy_add_post_handler,
};
- rspamd_lua_add_metamethod (ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
+ rspamd_lua_add_metamethod(ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
fuzzy_lua_reg = (luaL_Reg){
.name = "add_fuzzy_blacklist_handler",
.func = lua_fuzzy_add_blacklist_handler,
};
- rspamd_lua_add_metamethod (ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
+ rspamd_lua_add_metamethod(ctx->cfg->lua_state, "rspamd{worker}", &fuzzy_lua_reg);
- rspamd_lua_run_postloads (ctx->cfg->lua_state, ctx->cfg, ctx->event_loop,
- worker);
+ rspamd_lua_run_postloads(ctx->cfg->lua_state, ctx->cfg, ctx->event_loop,
+ worker);
- ev_loop (ctx->event_loop, 0);
- rspamd_worker_block_signals ();
+ ev_loop(ctx->event_loop, 0);
+ rspamd_worker_block_signals();
if (ctx->peer_fd != -1) {
if (worker->index == 0) {
- ev_io_stop (ctx->event_loop, &ctx->peer_ev);
+ ev_io_stop(ctx->event_loop, &ctx->peer_ev);
}
- close (ctx->peer_fd);
+ close(ctx->peer_fd);
}
if (worker->index == 0 && ctx->updates_pending->len > 0) {
- msg_info_config ("start another event loop to sync fuzzy storage");
+ msg_info_config("start another event loop to sync fuzzy storage");
- if (rspamd_fuzzy_process_updates_queue (ctx, local_db_name, TRUE)) {
- ev_loop (ctx->event_loop, 0);
- msg_info_config ("sync cycle is done");
+ if (rspamd_fuzzy_process_updates_queue(ctx, local_db_name, TRUE)) {
+ ev_loop(ctx->event_loop, 0);
+ msg_info_config("sync cycle is done");
}
else {
- msg_info_config ("no need to sync");
+ msg_info_config("no need to sync");
}
}
- rspamd_fuzzy_backend_close (ctx->backend);
+ rspamd_fuzzy_backend_close(ctx->backend);
if (worker->index == 0) {
- g_array_free (ctx->updates_pending, TRUE);
+ g_array_free(ctx->updates_pending, TRUE);
ctx->updates_pending = NULL;
}
if (ctx->keypair_cache) {
- rspamd_keypair_cache_destroy (ctx->keypair_cache);
+ rspamd_keypair_cache_destroy(ctx->keypair_cache);
}
if (ctx->ratelimit_buckets) {
/* Try the best to save ratelimits from the proper worker */
if ((!ctx->dedicated_update_worker && worker->index == 0) ||
(ctx->dedicated_update_worker && worker->index == 1)) {
- rspamd_fuzzy_maybe_save_ratelimits (ctx);
+ rspamd_fuzzy_maybe_save_ratelimits(ctx);
}
- rspamd_lru_hash_destroy (ctx->ratelimit_buckets);
+ rspamd_lru_hash_destroy(ctx->ratelimit_buckets);
}
if (ctx->lua_pre_handler_cbref != -1) {
- luaL_unref (ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_pre_handler_cbref);
+ luaL_unref(ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_pre_handler_cbref);
}
if (ctx->lua_post_handler_cbref != -1) {
- luaL_unref (ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_post_handler_cbref);
+ luaL_unref(ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_post_handler_cbref);
}
if (ctx->lua_blacklist_cbref != -1) {
- luaL_unref (ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
+ luaL_unref(ctx->cfg->lua_state, LUA_REGISTRYINDEX, ctx->lua_blacklist_cbref);
}
if (ctx->default_forbidden_ids) {
@@ -3282,9 +3270,9 @@ start_fuzzy (struct rspamd_worker *worker)
kh_destroy(fuzzy_key_ids_set, ctx->weak_ids);
}
- REF_RELEASE (ctx->cfg);
- rspamd_log_close (worker->srv->logger);
- rspamd_unset_crash_handler (worker->srv);
+ REF_RELEASE(ctx->cfg);
+ rspamd_log_close(worker->srv->logger);
+ rspamd_unset_crash_handler(worker->srv);
- exit (EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}