append_raw_header (struct rspamd_task *task,
GHashTable *target, struct raw_header *rh)
{
- struct raw_header *lp;
+ GPtrArray *ar;
- rh->next = NULL;
- rh->prev = rh;
- if ((lp =
- g_hash_table_lookup (target, rh->name)) != NULL) {
- DL_APPEND (lp, rh);
+ if ((ar = g_hash_table_lookup (target, rh->name)) != NULL) {
+ g_ptr_array_add (ar, rh);
}
else {
- g_hash_table_insert (target, rh->name, rh);
+ ar = g_ptr_array_sized_new (2);
+ g_ptr_array_add (ar, rh);
+ g_hash_table_insert (target, rh->name, ar);
}
+
msg_debug_task ("add raw header %s: %s", rh->name, rh->value);
}
new =
rspamd_mempool_alloc0 (task->task_pool,
sizeof (struct raw_header));
- new->prev = new;
l = p - c;
tmp = rspamd_mempool_alloc (task->task_pool, l + 1);
rspamd_strlcpy (tmp, c, l + 1);
sizeof (struct rspamd_mime_part));
hdrs = g_mime_object_get_headers (GMIME_OBJECT (part));
- mime_part->raw_headers = g_hash_table_new (rspamd_strcase_hash,
- rspamd_strcase_equal);
+ mime_part->raw_headers = g_hash_table_new_full (rspamd_strcase_hash,
+ rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
if (hdrs != NULL) {
process_raw_headers (task, mime_part->raw_headers,
sizeof (struct rspamd_mime_part));
hdrs = g_mime_object_get_headers (GMIME_OBJECT (part));
- mime_part->raw_headers = g_hash_table_new (rspamd_strcase_hash,
- rspamd_strcase_equal);
+ mime_part->raw_headers = g_hash_table_new_full (rspamd_strcase_hash,
+ rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
if (hdrs != NULL) {
process_raw_headers (task, mime_part->raw_headers,
GMimeParser *parser;
GMimeStream *stream;
GByteArray *tmp;
- GList *first, *cur;
+ GPtrArray *hdrs;
GMimeObject *parent;
const GMimeContentType *ct;
struct raw_header *rh;
RSPAMD_FILTER_ERROR, \
"cannot parse MIME in the message");
- /* TODO: backport to 0.9 */
g_object_unref (parser);
return FALSE;
}
rspamd_archives_process (task);
/* Parse received headers */
- first = rspamd_message_get_header (task, "Received", FALSE);
+ hdrs = rspamd_message_get_header_array (task, "Received", FALSE);
- for (cur = first, i = 0; cur != NULL; cur = g_list_next (cur), i ++) {
+ PTR_ARRAY_FOREACH (hdrs, i, rh) {
recv = rspamd_mempool_alloc0 (task->task_pool,
sizeof (struct received_header));
- rh = cur->data;
rspamd_smtp_recieved_parse (task, rh->decoded, strlen (rh->decoded), recv);
/*
* For the first header we must ensure that
}
if (task->from_envelope == NULL) {
- first = rspamd_message_get_header (task, "Return-Path", FALSE);
+ hdrs = rspamd_message_get_header_array (task, "Return-Path", FALSE);
- if (first) {
- rh = first->data;
+ if (hdrs && hdrs->len > 0) {
+ rh = g_ptr_array_index (hdrs, 0);
task->from_envelope = rspamd_email_address_from_smtp (rh->decoded,
strlen (rh->decoded));
}
}
if (task->deliver_to == NULL) {
- first = rspamd_message_get_header (task, "Delivered-To", FALSE);
+ hdrs = rspamd_message_get_header_array (task, "Delivered-To", FALSE);
- if (first) {
- rh = first->data;
+ if (hdrs && hdrs->len > 0) {
+ rh = g_ptr_array_index (hdrs, 0);
task->deliver_to = rspamd_mempool_strdup (task->task_pool, rh->decoded);
}
}
task->rcpt_mime);
#endif
}
- first = rspamd_message_get_header (task, "From", FALSE);
- if (first) {
- rh = first->data;
+
+ hdrs = rspamd_message_get_header_array (task, "From", FALSE);
+
+ if (hdrs && hdrs->len > 0) {
+ rh = g_ptr_array_index (hdrs, 0);
task->from_mime = internet_address_list_parse_string (rh->value);
if (task->from_mime) {
#ifdef GMIME24
}
/* Parse urls inside Subject header */
- cur = rspamd_message_get_header (task, "Subject", FALSE);
+ hdrs = rspamd_message_get_header_array (task, "Subject", FALSE);
- for (; cur != NULL; cur = g_list_next (cur)) {
- rh = cur->data;
+ PTR_ARRAY_FOREACH (hdrs, i, rh) {
p = rh->decoded;
len = strlen (p);
rspamd_url_find_multiple (task->task_pool, p, len, FALSE, NULL,
return TRUE;
}
-GList *
-rspamd_message_get_header (struct rspamd_task *task,
- const gchar *field,
- gboolean strong)
-{
- GList *gret = NULL;
- struct raw_header *rh;
-
- rh = g_hash_table_lookup (task->raw_headers, field);
-
- if (rh == NULL) {
- return NULL;
- }
-
- while (rh) {
- if (strong) {
- if (strcmp (rh->name, field) == 0) {
- gret = g_list_prepend (gret, rh);
- }
- }
- else {
- gret = g_list_prepend (gret, rh);
- }
- rh = rh->next;
- }
-
- if (gret != NULL) {
- gret = g_list_reverse (gret);
- rspamd_mempool_add_destructor (task->task_pool,
- (rspamd_mempool_destruct_t)g_list_free, gret);
- }
-
- return gret;
-}
GPtrArray *
-rspamd_message_get_header_array (struct rspamd_task *task,
+rspamd_message_get_header_from_hash (GHashTable *htb,
+ rspamd_mempool_t *pool,
const gchar *field,
gboolean strong)
{
- GPtrArray *ret;
- struct raw_header *rh, *cur;
- guint nelems = 0;
+ GPtrArray *ret, *ar;
+ struct raw_header *cur;
+ guint i;
- rh = g_hash_table_lookup (task->raw_headers, field);
+ ar = g_hash_table_lookup (htb, field);
- if (rh == NULL) {
+ if (ar == NULL) {
return NULL;
}
- LL_FOREACH (rh, cur) {
- nelems ++;
- }
-
- ret = g_ptr_array_sized_new (nelems);
+ if (strong && pool != NULL) {
+ /* Need to filter what we have */
+ ret = g_ptr_array_sized_new (ar->len);
- LL_FOREACH (rh, cur) {
- if (strong) {
- if (strcmp (rh->name, field) != 0) {
+ PTR_ARRAY_FOREACH (ar, i, cur) {
+ if (strcmp (cur->name, field) != 0) {
continue;
}
- }
- g_ptr_array_add (ret, cur);
- }
+ g_ptr_array_add (ret, cur);
+ }
- rspamd_mempool_add_destructor (task->task_pool,
+ rspamd_mempool_add_destructor (pool,
(rspamd_mempool_destruct_t)rspamd_ptr_array_free_hard, ret);
+ }
+ else {
+ ret = ar;
+ }
return ret;
}
+GPtrArray *
+rspamd_message_get_header_array (struct rspamd_task *task,
+ const gchar *field,
+ gboolean strong)
+{
+ return rspamd_message_get_header_from_hash (task->raw_headers,
+ task->task_pool, field, strong);
+}
+
GPtrArray *
rspamd_message_get_mime_header_array (struct rspamd_task *task,
const gchar *field,
gboolean strong)
{
- GPtrArray *ret;
- struct raw_header *rh, *cur;
+ GPtrArray *ret, *ar;
+ struct raw_header *cur;
guint nelems = 0, i;
struct rspamd_mime_part *mp;
for (i = 0; i < task->parts->len; i ++) {
mp = g_ptr_array_index (task->parts, i);
- rh = g_hash_table_lookup (mp->raw_headers, field);
+ ar = g_hash_table_lookup (mp->raw_headers, field);
- if (rh == NULL) {
+ if (ar == NULL) {
continue;
}
- LL_FOREACH (rh, cur) {
- nelems ++;
- }
+ nelems += ar->len;
}
if (nelems == 0) {
for (i = 0; i < task->parts->len; i ++) {
mp = g_ptr_array_index (task->parts, i);
- rh = g_hash_table_lookup (mp->raw_headers, field);
+ ar = g_hash_table_lookup (mp->raw_headers, field);
- LL_FOREACH (rh, cur) {
+ PTR_ARRAY_FOREACH (ar, i, cur) {
if (strong) {
- if (strcmp (rh->name, field) != 0) {
+ if (strcmp (cur->name, field) != 0) {
continue;
}
}
return ret;
}
-
-GPtrArray *
-rspamd_message_get_headers_array (struct rspamd_task *task, ...)
-{
- va_list ap;
- GPtrArray *ret;
- struct raw_header *rh, *cur;
- guint nelems = 0;
- const gchar *hname;
-
- va_start (ap, task);
-
- for (hname = va_arg (ap, const char *); hname != NULL;
- hname = va_arg (ap, const char *)) {
- rh = g_hash_table_lookup (task->raw_headers, hname);
-
- if (rh == NULL) {
- continue;
- }
- LL_FOREACH (rh, cur) {
- nelems ++;
- }
- }
-
- va_end (ap);
-
- if (nelems == 0) {
- return NULL;
- }
-
- ret = g_ptr_array_sized_new (nelems);
-
- /* Restart varargs processing */
- va_start (ap, task);
-
- for (hname = va_arg (ap, const char *); hname != NULL;
- hname = va_arg (ap, const char *)) {
- rh = g_hash_table_lookup (task->raw_headers, hname);
-
- if (rh == NULL) {
- continue;
- }
- LL_FOREACH (rh, cur) {
- g_ptr_array_add (ret, cur);
- }
- }
-
- va_end (ap);
-
- rspamd_mempool_add_destructor (task->task_pool,
- (rspamd_mempool_destruct_t)rspamd_ptr_array_free_hard, ret);
-
- return ret;
-}
-
-GPtrArray *
-rspamd_message_get_header_array_str (struct rspamd_task *task,
- const gchar *field,
- gboolean strong)
-{
- GPtrArray *ret;
- struct raw_header *rh, *cur;
- guint nelems = 0;
-
- rh = g_hash_table_lookup (task->raw_headers, field);
-
- if (rh == NULL) {
- return NULL;
- }
-
- LL_FOREACH (rh, cur) {
- nelems ++;
- }
-
- ret = g_ptr_array_sized_new (nelems);
-
- LL_FOREACH (rh, cur) {
- if (strong) {
- if (strcmp (rh->name, field) != 0) {
- continue;
- }
- }
-
- if (cur->decoded) {
- g_ptr_array_add (ret, cur->decoded);
- }
- }
-
- rspamd_mempool_add_destructor (task->task_pool,
- (rspamd_mempool_destruct_t)rspamd_ptr_array_free_hard, ret);
-
- return ret;
-}
-
-GPtrArray *
-rspamd_message_get_headers_array_str (struct rspamd_task *task, ...)
-{
- va_list ap;
- GPtrArray *ret;
- struct raw_header *rh, *cur;
- guint nelems = 0;
- const gchar *hname;
-
- va_start (ap, task);
-
- for (hname = va_arg (ap, const char *); hname != NULL;
- hname = va_arg (ap, const char *)) {
- rh = g_hash_table_lookup (task->raw_headers, hname);
-
- if (rh == NULL) {
- continue;
- }
- LL_FOREACH (rh, cur) {
- nelems ++;
- }
- }
-
- va_end (ap);
-
- if (nelems == 0) {
- return NULL;
- }
-
- ret = g_ptr_array_sized_new (nelems);
-
- /* Restart varargs processing */
- va_start (ap, task);
-
- for (hname = va_arg (ap, const char *); hname != NULL;
- hname = va_arg (ap, const char *)) {
- rh = g_hash_table_lookup (task->raw_headers, hname);
-
- if (rh == NULL) {
- continue;
- }
- LL_FOREACH (rh, cur) {
- if (cur->decoded) {
- g_ptr_array_add (ret, cur->decoded);
- }
- }
- }
-
- va_end (ap);
-
- rspamd_mempool_add_destructor (task->task_pool,
- (rspamd_mempool_destruct_t)rspamd_ptr_array_free_hard, ret);
-
- return ret;
-}
gboolean empty_separator;
gchar *separator;
gchar *decoded;
- struct raw_header *prev, *next;
};
/**
*/
gboolean rspamd_message_parse (struct rspamd_task *task);
-/**
- * Get a list of header's values with specified header's name using raw headers
- * @param task worker task structure
- * @param field header's name
- * @param strong if this flag is TRUE header's name is case sensitive, otherwise it is not
- * @return A list of header's values or NULL. Unlike previous function it is NOT required to free list or values. I should rework one of these functions some time.
- */
-GList * rspamd_message_get_header (struct rspamd_task *task,
- const gchar *field,
- gboolean strong);
-
/**
* Get an array of header's values with specified header's name using raw headers
* @param task worker task structure
gboolean strong);
/**
- * Get array of all headers from the list specified
- * @param task
- * @param h1
- * @return An array of headers (should not be freed as well)
- */
-GPtrArray *rspamd_message_get_headers_array (struct rspamd_task *task, ...);
-
-/**
- * Get an array of header's values with specified header's name returning decoded strings as values
- * @param task worker task structure
+ * Get an array of header's values with specified header's name using raw headers
+ * @param htb hash table indexed by header name (caseless) with ptr arrays as elements
* @param field header's name
* @param strong if this flag is TRUE header's name is case sensitive, otherwise it is not
* @return An array of header's values or NULL. It is NOT permitted to free array or values.
*/
-GPtrArray *rspamd_message_get_header_array_str (struct rspamd_task *task,
+GPtrArray *rspamd_message_get_header_from_hash (GHashTable *htb,
+ rspamd_mempool_t *pool,
const gchar *field,
gboolean strong);
-/**
- * Get array of all headers from the list specified returning decoded strings as values
- * @param task
- * @param h1
- * @return An array of headers (should not be freed as well)
- */
-GPtrArray *rspamd_message_get_headers_array_str (struct rspamd_task *task, ...);
-
#endif
rspamd_header_exists (struct rspamd_task * task, GArray * args, void *unused)
{
struct expression_argument *arg;
- GList *headerlist;
+ GPtrArray *headerlist;
if (args == NULL || task == NULL) {
return FALSE;
}
debug_task ("try to get header %s", (gchar *)arg->data);
- headerlist = rspamd_message_get_header (task,
+ headerlist = rspamd_message_get_header_array (task,
(gchar *)arg->data,
FALSE);
+
if (headerlist) {
return TRUE;
}
+
return FALSE;
}
const gchar *dkim_header,
const gchar *dkim_domain)
{
- struct raw_header *rh, *rh_iter;
- guint rh_num = 0;
- guint i;
- GPtrArray *sign_headers;
+ struct raw_header *rh;
+ guint rh_num = 0, i;
+ GPtrArray *ar;
if (dkim_header == NULL) {
- rh = g_hash_table_lookup (task->raw_headers, header_name);
-
- if (rh) {
- LL_FOREACH (rh, rh_iter) {
- rh_num++;
- }
+ ar = g_hash_table_lookup (task->raw_headers, header_name);
- if (rh_num > count) {
+ if (ar) {
+ if (ar->len > count) {
/* Set skip count */
- rh_num -= count;
+ rh_num = ar->len - count;
}
else {
rh_num = 0;
}
- sign_headers = g_ptr_array_sized_new (rh_num);
- /* Skip number of headers */
- rh_iter = rh;
- while (rh_num) {
- rh_iter = rh_iter->next;
- rh_num--;
- }
- /* Now insert required headers */
- while (rh_iter) {
- g_ptr_array_add (sign_headers, rh_iter);
- rh_iter = rh_iter->next;
- }
-
- for (i = 0; i < sign_headers->len; i ++) {
- rh = g_ptr_array_index (sign_headers, i);
+ for (i = rh_num; i < ar->len; i ++) {
+ rh = g_ptr_array_index (ar, i);
if (ctx->header_canon_type == DKIM_CANON_SIMPLE) {
rspamd_dkim_hash_update (ctx->headers_hash, rh->raw_value,
else {
if (!rspamd_dkim_canonize_header_relaxed (ctx, rh->value,
header_name, FALSE)) {
-
- g_ptr_array_free (sign_headers, TRUE);
return FALSE;
}
}
}
-
- g_ptr_array_free (sign_headers, TRUE);
}
}
else {
/* For signature check just use the saved dkim header */
if (ctx->header_canon_type == DKIM_CANON_SIMPLE) {
/* We need to find our own signature and use it */
- rh = g_hash_table_lookup (task->raw_headers, DKIM_SIGNHEADER);
+ ar = g_hash_table_lookup (task->raw_headers, DKIM_SIGNHEADER);
- if (rh) {
+ if (ar) {
/* We need to find our own signature */
if (!dkim_domain) {
return FALSE;
}
-
- LL_FOREACH (rh, rh_iter) {
+ PTR_ARRAY_FOREACH (ar, i, rh) {
if (rspamd_substring_search_twoway (rh->raw_value,
rh->raw_len, dkim_domain,
strlen (dkim_domain)) != -1) {
{
guint ret = 0, i, re_id;
GPtrArray *headerlist;
- GList *slist;
GHashTableIter it;
struct raw_header *rh;
const gchar *in, *end;
* of the body content.
*/
- slist = rspamd_message_get_header (task, "Subject", FALSE);
+ headerlist = rspamd_message_get_header_array (task, "Subject", FALSE);
- if (slist) {
- rh = slist->data;
+ if (headerlist && headerlist->len > 0) {
+ rh = g_ptr_array_index (headerlist, 0);
scvec[0] = (guchar *)rh->decoded;
lenvec[0] = strlen (rh->decoded);
(rspamd_mempool_destruct_t) g_hash_table_unref,
new_task->results);
- new_task->raw_headers = g_hash_table_new (rspamd_strcase_hash,
- rspamd_strcase_equal);
+ new_task->raw_headers = g_hash_table_new_full (rspamd_strcase_hash,
+ rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
new_task->request_headers = g_hash_table_new_full (rspamd_ftok_icase_hash,
rspamd_ftok_icase_equal, rspamd_fstring_mapped_ftok_free,
rspamd_request_header_dtor);
rspamd_stat_tokenize_header (struct rspamd_task *task,
const gchar *name, const gchar *prefix, GArray *ar)
{
- struct raw_header *rh, *cur;
+ struct raw_header *cur;
+ GPtrArray *hdrs;
+ guint i;
rspamd_ftok_t str;
- rh = g_hash_table_lookup (task->raw_headers, name);
+ hdrs = g_hash_table_lookup (task->raw_headers, name);
- if (rh != NULL) {
+ if (hdrs != NULL) {
- LL_FOREACH (rh, cur) {
+ PTR_ARRAY_FOREACH (hdrs, i, cur) {
if (cur->name != NULL) {
str.begin = cur->name;
str.len = strlen (cur->name);
* Push specific header to lua
*/
gint rspamd_lua_push_header (lua_State * L,
- GHashTable *hdrs,
+ GPtrArray *hdrs,
const gchar *name,
gboolean strong,
gboolean full,
static gint
lua_mimepart_get_header_common (lua_State *L, gboolean full, gboolean raw)
{
- gboolean strong = FALSE;
struct rspamd_mime_part *part = lua_check_mimepart (L);
const gchar *name;
+ GPtrArray *ar;
name = luaL_checkstring (L, 2);
if (name && part) {
- if (lua_gettop (L) == 3) {
- strong = lua_toboolean (L, 3);
- }
- return rspamd_lua_push_header (L, part->raw_headers, name, strong, full, raw);
+
+ ar = rspamd_message_get_header_from_hash (part->raw_headers, NULL,
+ name, FALSE);
+
+ return rspamd_lua_push_header (L, ar, name, FALSE, full, raw);
}
+
lua_pushnil (L);
+
return 1;
}
gint
rspamd_lua_push_header (lua_State * L,
- GHashTable *hdrs,
+ GPtrArray *ar,
const gchar *name,
gboolean strong,
gboolean full,
gboolean raw)
{
- struct raw_header *rh, *cur;
- gint i = 1;
+ struct raw_header *rh;
+ guint i;
const gchar *val;
- rh = g_hash_table_lookup (hdrs, name);
-
- if (rh == NULL) {
+ if (ar == NULL || ar->len == 0) {
lua_pushnil (L);
return 1;
}
if (full) {
- i = 0;
- LL_FOREACH (rh, cur) {
- i ++;
- }
-
- lua_createtable (L, i, 0);
+ lua_createtable (L, ar->len, 0);
}
- i = 1;
-
- while (rh) {
- if (rh->name == NULL) {
- rh = rh->next;
- continue;
- }
- /* Check case sensivity */
- if (strong) {
- if (strcmp (rh->name, name) != 0) {
- rh = rh->next;
- continue;
- }
- }
+ PTR_ARRAY_FOREACH (ar, i, rh) {
if (full) {
/* Create new associated table for a header */
lua_createtable (L, 0, 6);
rspamd_lua_table_set (L, "name", rh->name);
+
if (rh->value) {
rspamd_lua_table_set (L, "value", rh->value);
}
+
if (rh->decoded) {
rspamd_lua_table_set (L, "decoded", rh->value);
}
+
lua_pushstring (L, "tab_separated");
lua_pushboolean (L, rh->tab_separated);
lua_settable (L, -3);
lua_pushboolean (L, rh->empty_separator);
lua_settable (L, -3);
rspamd_lua_table_set (L, "separator", rh->separator);
- lua_rawseti (L, -2, i++);
- /* Process next element */
- rh = rh->next;
+ lua_rawseti (L, -2, i + 1);
}
else {
if (!raw) {
gboolean strong = FALSE;
struct rspamd_task *task = lua_check_task (L, 1);
const gchar *name;
+ GPtrArray *ar;
name = luaL_checkstring (L, 2);
strong = lua_toboolean (L, 3);
}
- return rspamd_lua_push_header (L, task->raw_headers, name,
+ ar = rspamd_message_get_header_array (task, name, strong);
+
+ return rspamd_lua_push_header (L, ar, name,
strong, full, raw);
}
else {
static void
dkim_symbol_callback (struct rspamd_task *task, void *unused)
{
- GList *hlist;
+ GPtrArray *hlist;
rspamd_dkim_context_t *ctx;
rspamd_dkim_key_t *key;
GError *err = NULL;
struct raw_header *rh;
struct dkim_check_result *res = NULL, *cur;
- guint checked = 0;
+ guint checked = 0, i;
+
/* First check if plugin should be enabled */
if (task->user != NULL || rspamd_inet_address_is_local (task->from_addr)) {
msg_info_task ("skip DKIM checks for local networks and authorized users");
}
/* Now check if a message has its signature */
- hlist = rspamd_message_get_header (task,
+ hlist = rspamd_message_get_header_array (task,
DKIM_SIGNHEADER,
FALSE);
- if (hlist != NULL) {
+ if (hlist != NULL && hlist->len > 0) {
msg_debug_task ("dkim signature found");
- while (hlist != NULL) {
- rh = (struct raw_header *)hlist->data;
-
+ PTR_ARRAY_FOREACH (hlist, i, rh) {
if (rh->decoded == NULL || rh->decoded[0] == '\0') {
msg_info_task ("<%s> cannot load empty DKIM context",
task->message_id);
- hlist = g_list_next (hlist);
continue;
}
task->task_pool,
dkim_module_ctx->time_jitter,
&err);
+
if (ctx == NULL) {
if (err != NULL) {
msg_info_task ("<%s> cannot parse DKIM context: %e",
task->message_id);
}
- hlist = g_list_next (hlist);
continue;
}
else {
rspamd_dkim_get_domain (ctx)) == NULL)) {
msg_debug_task ("skip dkim check for %s domain",
rspamd_dkim_get_domain (ctx));
- hlist = g_list_next (hlist);
continue;
}
}
if (dkim_module_ctx->skip_multi) {
- if (hlist->next) {
+ if (hlist->len > 1) {
msg_info_task ("message has multiple signatures but we"
" check only one as 'skip_multi' is set");
}
" is reached", checked);
break;
}
-
- hlist = g_list_next (hlist);
}
}
else {
rspamd_pubkey_alg (rule->peer_key));
}
-static struct fuzzy_cmd_io *
-fuzzy_cmd_from_task_meta (struct fuzzy_rule *rule,
- int c,
- gint flag,
- guint32 weight,
- rspamd_mempool_t *pool,
- struct rspamd_task *task)
-{
- struct rspamd_fuzzy_cmd *cmd;
- struct rspamd_fuzzy_encrypted_cmd *enccmd;
- struct fuzzy_cmd_io *io;
- rspamd_cryptobox_hash_state_t st;
-
- GHashTableIter it;
- gpointer k, v;
- struct rspamd_url *u;
- struct raw_header *rh;
- GList *cur;
-
- if (rule->peer_key) {
- enccmd = rspamd_mempool_alloc0 (pool, sizeof (*enccmd));
- cmd = &enccmd->cmd;
- }
- else {
- cmd = rspamd_mempool_alloc0 (pool, sizeof (*cmd));
- }
-
- cmd->cmd = c;
- cmd->version = RSPAMD_FUZZY_PLUGIN_VERSION;
- if (c != FUZZY_CHECK) {
- cmd->flag = flag;
- cmd->value = weight;
- }
- cmd->shingles_count = 0;
- cmd->tag = ottery_rand_uint32 ();
- /* Use blake2b for digest */
- rspamd_cryptobox_hash_init (&st, rule->hash_key->str, rule->hash_key->len);
- /* Hash URL's */
- g_hash_table_iter_init (&it, task->urls);
-
- while (g_hash_table_iter_next (&it, &k, &v)) {
- u = v;
- if (u->hostlen > 0) {
- rspamd_cryptobox_hash_update (&st, u->host, u->hostlen);
- }
- if (u->datalen > 0) {
- rspamd_cryptobox_hash_update (&st, u->data, u->datalen);
- }
- }
- /* Now get some headers to iterate on */
-
- cur = rule->fuzzy_headers;
-
- while (cur) {
- rh = g_hash_table_lookup (task->raw_headers, cur->data);
-
- while (rh) {
- if (rh->decoded) {
- rspamd_cryptobox_hash_update (&st, rh->decoded,
- strlen (rh->decoded));
- }
-
- rh = rh->next;
- }
- cur = g_list_next (cur);
- }
-
- rspamd_cryptobox_hash_final (&st, cmd->digest);
-
- io = rspamd_mempool_alloc (pool, sizeof (*io));
- io->flags = 0;
- io->tag = cmd->tag;
- memcpy (&io->cmd, cmd, sizeof (io->cmd));
-
- if (rule->peer_key) {
- fuzzy_encrypt_cmd (rule, &enccmd->hdr, (guchar *)cmd, sizeof (*cmd));
- io->io.iov_base = enccmd;
- io->io.iov_len = sizeof (*enccmd);
- }
- else {
- io->io.iov_base = cmd;
- io->io.iov_len = sizeof (*cmd);
- }
-
- return io;
-}
-
static struct fuzzy_cmd_io *
fuzzy_cmd_stat (struct fuzzy_rule *rule,
int c,
projects / rspamd.git / commitdiff