CODE:
retav = newAV();
#ifndef GMIME24
- rcpt = g_mime_message_get_recipients (message, type);
+ rcpt = (InternetAddressList *)g_mime_message_get_recipients (message, type);
while (rcpt) {
SV * address = newSViv(0);
sv_setref_pv(address, "Mail::Rspamd::InternetAddress", (Mail__Rspamd__InternetAddress)(rcpt->address));
char * textdata;
GMimeContentType *ct;
CODE:
- ct = g_mime_object_get_content_type (mime_object);
+ ct = (GMimeContentType *)g_mime_object_get_content_type (mime_object);
textdata = g_mime_content_type_to_string (ct);
RETVAL = g_mime_content_type_new_from_string (textdata);
plist = g_list_prepend (plist, RETVAL);
const char *symbol
double flag
CODE:
- insert_result (task, metric, symbol, flag);
+ insert_result (task, metric, symbol, flag, NULL);
Mail::Rspamd::Conf
rspamd_task_get_conf (task)
}
static void
-read_buffers (int fd, rspamd_io_dispatcher_t *d)
+read_buffers (int fd, rspamd_io_dispatcher_t *d, gboolean skip_read)
{
ssize_t r;
GError *err;
return;
}
}
- else {
+ else if (!skip_read) {
/* Try to read the whole buffer */
r = read (fd, d->in_buf->pos, BUFREMAIN (d->in_buf));
if (r == -1 && errno != EAGAIN) {
len = d->in_buf->data->len;
if (d->policy != saved_policy) {
msg_debug ("read_buffers: policy changed during callback, restart buffer's processing");
- read_buffers (fd, d);
+ read_buffers (fd, d, TRUE);
return;
}
continue;
len = d->in_buf->data->len;
if (d->policy != saved_policy) {
msg_debug ("read_buffers: policy changed during callback, restart buffer's processing");
- read_buffers (fd, d);
+ read_buffers (fd, d, TRUE);
return;
}
continue;
}
break;
case EV_READ:
- read_buffers (fd, d);
+ read_buffers (fd, d, FALSE);
break;
}
}
#include "tokenizers/tokenizers.h"
void
-insert_result (struct worker_task *task, const char *metric_name, const char *symbol, double flag)
+insert_result (struct worker_task *task, const char *metric_name, const char *symbol, double flag, GList *opts)
{
struct metric *metric;
struct metric_result *metric_res;
- double *fl = memory_pool_alloc (task->task_pool, sizeof (double));
- *fl = flag;
+ struct symbol *s;
metric = g_hash_table_lookup (task->worker->srv->cfg->metrics, metric_name);
if (metric == NULL) {
g_hash_table_insert (task->results, (gpointer)metric_name, metric_res);
}
- g_hash_table_insert (metric_res->symbols, (gpointer)symbol, fl);
+ if ((s = g_hash_table_lookup (metric_res->symbols, symbol)) != NULL) {
+ if (s->options && opts) {
+ /* Append new options */
+ s->options = g_list_concat (s->options, opts);
+ /*
+ * Note that there is no need to add new destructor of GList as elements of appended
+ * GList are used directly, so just free initial GList
+ */
+ }
+ else if (opts) {
+ s->options = opts;
+ memory_pool_add_destructor (task->task_pool, (pool_destruct_func)g_list_free, s->options);
+ }
+
+ s->score = flag;
+ }
+ else {
+ s = memory_pool_alloc (task->task_pool, sizeof (struct symbol));
+ s->score = flag;
+ s->options = opts;
+
+ if (opts) {
+ memory_pool_add_destructor (task->task_pool, (pool_destruct_func)g_list_free, s->options);
+ }
+
+ g_hash_table_insert (metric_res->symbols, (gpointer)symbol, s);
+ }
}
/*
consolidation_callback (gpointer key, gpointer value, gpointer arg)
{
double *factor;
- double val = *(double *)value;
+ struct symbol *s = (struct symbol *)value;
struct consolidation_callback_data *data = (struct consolidation_callback_data *)arg;
factor = g_hash_table_lookup (data->task->worker->srv->cfg->factors, key);
if (factor == NULL) {
- msg_debug ("consolidation_callback: got %.2f score for metric %s, factor: 1", val, (char *)key);
- data->score += val;
+ msg_debug ("consolidation_callback: got %.2f score for metric %s, factor: 1", s->score, (char *)key);
+ data->score += s->score;
}
else {
- data->score += *factor * val;
- msg_debug ("consolidation_callback: got %.2f score for metric %s, factor: %.2f", val, (char *)key, *factor);
+ data->score += *factor * s->score;
+ msg_debug ("consolidation_callback: got %.2f score for metric %s, factor: %.2f", s->score, (char *)key, *factor);
}
}
}
cur = LIST_NEXT (cur, next);
}
- /* Process all metrics */
- g_hash_table_foreach (task->results, metric_process_callback, task);
+ /* Process all statfiles */
process_statfiles (task);
/* XXX: ugly direct call */
task->dispatcher->write_callback (task);
GQueue *stack;
GList *symbols = NULL, *s;
gsize cur, op1, op2;
- double *res;
+ struct symbol *res;
stack = g_queue_new ();
s = g_list_next (s);
}
/* Add new symbol */
- res = memory_pool_alloc (cd->task->task_pool, sizeof (double));
- *res = 1;
+ res = memory_pool_alloc (cd->task->task_pool, sizeof (struct symbol));
+ res->score = 1.;
+ res->options = NULL;
g_hash_table_insert (cd->metric_res->symbols, key, res);
}
}
w = memory_pool_alloc (task->task_pool, sizeof (double));
filename = classifier->result_file_func (res->ctx, w);
- insert_result (task, res->metric->name, classifier->name, *w);
+ insert_result (task, res->metric->name, classifier->name, *w, NULL);
msg_debug ("statfiles_results_callback: got total weight %.2f for metric %s", *w, res->metric->name);
}
LIST_ENTRY (filter) next; /**< chain link */
};
+/**
+ * Rspamd symbol
+ */
+struct symbol {
+ double score; /**< symbol's score */
+ GList *options; /**< list of symbol's options */
+};
+
/**
* Common definition of metric
*/
* @param metric_name metric's name to which we need to insert result
* @param symbol symbol to insert
* @param flag numeric weight for symbol
+ * @param opts list of symbol's options
*/
-void insert_result (struct worker_task *task, const char *metric_name, const char *symbol, double flag);
+void insert_result (struct worker_task *task, const char *metric_name, const char *symbol, double flag, GList *opts);
/**
* Process all results and form composite metrics from existent metrics as it is defined in config
void
memory_pool_add_destructor (memory_pool_t *pool, pool_destruct_func func, void *data)
{
- struct _pool_destructors *cur;
+ struct _pool_destructors *cur, *tmp;
cur = memory_pool_alloc (pool, sizeof (struct _pool_destructors));
if (cur) {
+ /* Check whether we have identical destructor in pool */
+ tmp = pool->destructors;
+ while (tmp) {
+ if (tmp->func == func && tmp->data == data) {
+ /* Do not add identical destructors, they must be unique */
+ return;
+ }
+ tmp = tmp->prev;
+ }
+
cur->func = func;
cur->data = data;
cur->prev = pool->destructors;
op1 = GPOINTER_TO_SIZE (g_queue_pop_head (stack));
if (op1) {
/* Add symbol to results */
- insert_result (task, regexp_module_ctx->metric, item->symbol, op1);
+ insert_result (task, regexp_module_ctx->metric, item->symbol, op1, NULL);
}
}
}
static void
-process_dns_results (struct worker_task *task, struct suffix_item *suffix, uint32_t addr)
+process_dns_results (struct worker_task *task, struct suffix_item *suffix, char *url, uint32_t addr)
{
char *c, *symbol;
GList *cur;
symbol = memory_pool_alloc (task->task_pool, len);
snprintf (symbol, len, "%s%s%s", suffix->symbol, bit->symbol, c + 2);
*c = '%';
- insert_result (task, surbl_module_ctx->metric, symbol, 1);
+ insert_result (task, surbl_module_ctx->metric, symbol, 1,
+ g_list_prepend (NULL, memory_pool_strdup (task->task_pool, url)));
found = 1;
}
cur = g_list_next (cur);
}
if (!found) {
- insert_result (task, surbl_module_ctx->metric, suffix->symbol, 1);
+ insert_result (task, surbl_module_ctx->metric, symbol, 1,
+ g_list_prepend (NULL, memory_pool_strdup (task->task_pool, url)));
}
}
else {
- insert_result (task, surbl_module_ctx->metric, suffix->symbol, 1);
+ insert_result (task, surbl_module_ctx->metric, symbol, 1,
+ g_list_prepend (NULL, memory_pool_strdup (task->task_pool, url)));
}
}
/* If we have result from DNS server, this url exists in SURBL, so increase score */
if (result == DNS_ERR_NONE && type == DNS_IPv4_A) {
msg_info ("surbl_check: url %s is in surbl %s", param->url->host, param->suffix->suffix);
- process_dns_results (param->task, param->suffix, (uint32_t)(((in_addr_t *)addresses)[0]));
+ process_dns_results (param->task, param->suffix, param->url->host, (uint32_t)(((in_addr_t *)addresses)[0]));
}
else {
msg_debug ("surbl_check: url %s is not in surbl %s", param->url->host, param->suffix->suffix);
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
#include "main.h"
+#include "cfg_file.h"
/* Max line size as it is defined in rfc2822 */
#define OUTBUFSIZ 1000
}
static void
-show_metric_result (gpointer metric_name, gpointer metric_value, void *user_data)
+metric_symbols_callback (gpointer key, gpointer value, void *user_data)
{
struct worker_task *task = (struct worker_task *)user_data;
- int r;
+ int r = 0;
char outbuf[OUTBUFSIZ];
- struct metric_result *metric_res = (struct metric_result *)metric_value;
- int is_spam = 0;
+ struct symbol *s = (struct symbol *)value;
+ GList *cur;
- if (metric_res->score >= metric_res->metric->required_score) {
- is_spam = 1;
- }
- if (task->proto == SPAMC_PROTO) {
- r = snprintf (outbuf, sizeof (outbuf), "Spam: %s ; %.2f / %.2f" CRLF,
- (is_spam) ? "True" : "False", metric_res->score, metric_res->metric->required_score);
+ if (s->options) {
+ r = snprintf (outbuf, OUTBUFSIZ, "Symbol: %s; ", (char *)key);
+ cur = s->options;
+ while (cur) {
+ if (g_list_next (cur)) {
+ r += snprintf (outbuf + r, OUTBUFSIZ - r, "%s,", (char *)cur->data);
+ }
+ else {
+ r += snprintf (outbuf + r, OUTBUFSIZ - r, "%s" CRLF, (char *)cur->data);
+ }
+ cur = g_list_next (cur);
+ }
+ /* End line with CRLF strictly */
+ if (r >= OUTBUFSIZ - 1) {
+ outbuf[OUTBUFSIZ - 2] = '\r';
+ outbuf[OUTBUFSIZ - 1] = '\n';
+ }
}
else {
- r = snprintf (outbuf, sizeof (outbuf), "%s: %s ; %.2f / %.2f" CRLF, (char *)metric_name,
- (is_spam) ? "True" : "False", metric_res->score, metric_res->metric->required_score);
+ r = snprintf (outbuf, OUTBUFSIZ, "Symbol: %s" CRLF, (char *)key);
}
+
rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE);
}
-static int
-write_check_reply (struct worker_task *task)
+static void
+show_metric_symbols (struct metric_result *metric_res, struct worker_task *task)
{
- int r;
+ int r = 0;
+ GList *symbols, *cur;
char outbuf[OUTBUFSIZ];
- struct metric_result *metric_res;
- r = snprintf (outbuf, sizeof (outbuf), "%s 0 %s" CRLF, (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER, "OK");
- rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE);
if (task->proto == SPAMC_PROTO) {
- /* Ignore metrics, just write report for 'default' metric */
- metric_res = g_hash_table_lookup (task->results, "default");
- if (metric_res == NULL) {
- return -1;
- }
- else {
- show_metric_result ((gpointer)"default", (gpointer)metric_res, (void *)task);
+ symbols = g_hash_table_get_keys (metric_res->symbols);
+ cur = symbols;
+ while (cur) {
+ if (g_list_next (cur) != NULL) {
+ r += snprintf (outbuf + r, sizeof (outbuf) - r, "%s,", (char *)cur->data);
+ }
+ else {
+ r += snprintf (outbuf + r, sizeof (outbuf) - r, "%s" CRLF, (char *)cur->data);
+ }
+ cur = g_list_next (cur);
}
+ g_list_free (symbols);
+ rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE);
}
else {
- /* Write result for each metric separately */
- g_hash_table_foreach (task->results, show_metric_result, task);
- /* URL stat */
- show_url_header (task);
+ g_hash_table_foreach (metric_res->symbols, metric_symbols_callback, task);
}
- rspamd_dispatcher_write (task->dispatcher, CRLF, sizeof (CRLF) - 1, FALSE);
-
- return 0;
}
static void
-show_metric_symbols (gpointer metric_name, gpointer metric_value, void *user_data)
+show_metric_result (gpointer metric_name, gpointer metric_value, void *user_data)
{
struct worker_task *task = (struct worker_task *)user_data;
- int r = 0;
+ int r;
char outbuf[OUTBUFSIZ];
- GList *symbols = NULL, *cur;
struct metric_result *metric_res = (struct metric_result *)metric_value;
-
- if (task->proto == RSPAMC_PROTO) {
- r = snprintf (outbuf, sizeof (outbuf), "%s: ", (char *)metric_name);
+ struct metric *m;
+ int is_spam = 0;
+
+ if (metric_name == NULL || metric_value == NULL) {
+ m = g_hash_table_lookup (task->cfg->metrics, "default");
+ if (task->proto == SPAMC_PROTO) {
+ r = snprintf (outbuf, sizeof (outbuf), "Spam: False ; 0 / %.2f" CRLF,
+ m != NULL ? m->required_score : 0);
+ }
+ else {
+ r = snprintf (outbuf, sizeof (outbuf), "Metric: default; False; 0 / %.2f" CRLF,
+ m != NULL ? m->required_score : 0);
+ }
}
-
- symbols = g_hash_table_get_keys (metric_res->symbols);
- cur = symbols;
- while (cur) {
- if (g_list_next (cur) != NULL) {
- r += snprintf (outbuf + r, sizeof (outbuf) - r, "%s,", (char *)cur->data);
+ else {
+ if (metric_res->score >= metric_res->metric->required_score) {
+ is_spam = 1;
+ }
+ if (task->proto == SPAMC_PROTO) {
+ r = snprintf (outbuf, sizeof (outbuf), "Spam: %s ; %.2f / %.2f" CRLF,
+ (is_spam) ? "True" : "False", metric_res->score, metric_res->metric->required_score);
}
else {
- r += snprintf (outbuf + r, sizeof (outbuf) - r, "%s", (char *)cur->data);
+ r = snprintf (outbuf, sizeof (outbuf), "Metric: %s; %s; %.2f / %.2f" CRLF, (char *)metric_name,
+ (is_spam) ? "True" : "False", metric_res->score, metric_res->metric->required_score);
}
- cur = g_list_next (cur);
}
- g_list_free (symbols);
- msg_debug ("show_metric_symbols: write symbols line: %s", outbuf);
- outbuf[r++] = '\r'; outbuf[r++] = '\n';
rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE);
+
+ if (task->cmd == CMD_SYMBOLS && metric_value != NULL) {
+ show_metric_symbols (metric_res, task);
+ }
}
static int
-write_symbols_reply (struct worker_task *task)
+write_check_reply (struct worker_task *task)
{
+ int r;
+ char outbuf[OUTBUFSIZ];
struct metric_result *metric_res;
-
- /* First of all write normal results by calling write_check_reply */
- if (write_check_reply (task) == -1) {
- return -1;
- }
- /* Now write symbols */
+
+ r = snprintf (outbuf, sizeof (outbuf), "%s 0 %s" CRLF, (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER, "OK");
+ rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE);
if (task->proto == SPAMC_PROTO) {
/* Ignore metrics, just write report for 'default' metric */
metric_res = g_hash_table_lookup (task->results, "default");
if (metric_res == NULL) {
- return -1;
+ /* Implicit metric result */
+ show_metric_result (NULL, NULL, (void *)task);
}
else {
- show_metric_symbols ((gpointer)"default", (gpointer)metric_res, (void *)task);
+ show_metric_result ((gpointer)"default", (gpointer)metric_res, (void *)task);
}
}
else {
+ /* Show default metric first */
+ metric_res = g_hash_table_lookup (task->results, "default");
+ if (metric_res == NULL) {
+ /* Implicit metric result */
+ show_metric_result (NULL, NULL, (void *)task);
+ }
+ else {
+ show_metric_result ((gpointer)"default", (gpointer)metric_res, (void *)task);
+ }
+ g_hash_table_remove (task->results, "default");
+
/* Write result for each metric separately */
- g_hash_table_foreach (task->results, show_metric_symbols, task);
+ g_hash_table_foreach (task->results, show_metric_result, task);
+ /* URL stat */
+ show_url_header (task);
}
+ rspamd_dispatcher_write (task->dispatcher, CRLF, sizeof (CRLF) - 1, FALSE);
return 0;
}
case CMD_REPORT_IFSPAM:
case CMD_REPORT:
case CMD_CHECK:
- return write_check_reply (task);
- break;
case CMD_SYMBOLS:
- return write_symbols_reply (task);
+ return write_check_reply (task);
break;
case CMD_PROCESS:
return write_process_reply (task);
projects / rspamd.git / commitdiff