#define ERROR_HEADER "Error"
#define USER_HEADER "User"
#define PASS_HEADER "Pass"
+#define JSON_HEADER "Json"
#define DELIVER_TO_HEADER "Deliver-To"
static GList *custom_commands = NULL;
return NULL;
}
-static gint
-parse_command (struct worker_task *task, f_str_t * line)
+static gboolean
+parse_check_command (struct worker_task *task, gchar *token)
{
- gchar *token;
- struct custom_command *cmd;
GList *cur;
-
- task->proto_ver = 11;
- token = separate_command (line, ' ');
- if (line == NULL || token == NULL) {
- debug_task ("bad command");
- return -1;
- }
+ struct custom_command *cmd;
switch (token[0]) {
case 'c':
}
else {
debug_task ("bad command: %s", token);
- return -1;
+ return FALSE;
}
break;
case 's':
}
else {
debug_task ("bad command: %s", token);
- return -1;
+ return FALSE;
}
break;
case 'p':
}
else {
debug_task ("bad command: %s", token);
- return -1;
+ return FALSE;
}
break;
case 'r':
}
else {
debug_task ("bad command: %s", token);
- return -1;
+ return FALSE;
}
break;
default:
if (cur == NULL) {
debug_task ("bad command: %s", token);
- return -1;
+ return FALSE;
}
break;
}
+ return TRUE;
+}
+
+static gboolean
+parse_rspamc_command (struct worker_task *task, f_str_t * line)
+{
+ gchar *token;
+
+ /* Separate line */
+ token = separate_command (line, ' ');
+ if (line == NULL || token == NULL) {
+ debug_task ("bad command");
+ return FALSE;
+ }
+
+ if (!parse_check_command (task, token)) {
+ return FALSE;
+ }
+
if (g_ascii_strncasecmp (line->begin, RSPAMC_GREETING, sizeof (RSPAMC_GREETING) - 1) == 0) {
task->proto = RSPAMC_PROTO;
task->proto_ver = 10;
task->proto_ver = 12;
}
else {
- return -1;
+ return FALSE;
}
task->state = READ_HEADER;
+
+ return TRUE;
+}
+
+static gboolean
+parse_http_command (struct worker_task *task, f_str_t * line)
+{
+ guint8 *p, *end, *c;
+ gint state = 0, next_state;
+ gchar *cmd;
+
+ p = line->begin;
+ end = p + line->len;
+ task->proto = RSPAMC_PROTO;
+
+ while (p < end) {
+ switch (state) {
+ case 0:
+ /* Expect GET or POST here */
+ if ((end - p > 3 &&
+ (*p == 'G' || *p == 'g') &&
+ (p[1] == 'E' || p[1] == 'e') &&
+ (p[2] == 'T' || p[2] == 't')) ||
+ (end - p > 4 &&
+ (*p == 'P' || *p == 'p') &&
+ (p[1] == 'O' || p[1] == 'o') &&
+ (p[2] == 'S' || p[2] == 's') &&
+ (p[3] == 'T' || p[3] == 't'))) {
+ state = 99;
+ next_state = 1;
+ p += (*p == 'g' || *p == 'G') ? 3 : 4;
+ }
+ else {
+ msg_info ("invalid HTTP request: %V", line);
+ return FALSE;
+ }
+ break;
+ case 1:
+ /* Get command or path */
+ if (!g_ascii_isspace (*p)) {
+ p ++;
+ }
+ else {
+ /* Copy command */
+ cmd = memory_pool_alloc (task->task_pool, p - c);
+ rspamd_strlcpy (cmd, c, p - c);
+ /* Skip the first '/' */
+ if (*cmd == '/') {
+ cmd ++;
+ }
+ if (!parse_check_command (task, cmd)) {
+ /* Assume that command is symbols */
+ task->cmd = CMD_SYMBOLS;
+ }
+ state = 99;
+ next_state = 2;
+ }
+ break;
+ case 2:
+ /* Get HTTP/1.0 or HTTP/1.1 */
+ if (p == end - 1) {
+ /* We are at the end */
+ if (g_ascii_strncasecmp (c, "HTTP/1.0", sizeof ("HTTP/1.0") - 1) == 0 ||
+ g_ascii_strncasecmp (c, "HTTP/1.1", sizeof ("HTTP/1.1") - 1) == 0) {
+ task->state = READ_HEADER;
+ return TRUE;
+ }
+ }
+ else {
+ p ++;
+ }
+ break;
+ case 99:
+ /* Skip spaces */
+ if (g_ascii_isspace (*p)) {
+ p ++;
+ }
+ else {
+ state = next_state;
+ c = p;
+ }
+ break;
+ }
+ }
+
+ return FALSE;
+}
+
+static gboolean
+parse_command (struct worker_task *task, f_str_t * line)
+{
+ task->proto_ver = 11;
+
+ if (! task->is_http) {
+ return parse_rspamc_command (task, line);
+ }
+ else {
+ return parse_http_command (task, line);
+ }
- return 0;
+ /* Unreached */
+ return FALSE;
}
-static gint
+static gboolean
parse_header (struct worker_task *task, f_str_t * line)
{
gchar *headern, *err, *tmp;
task->last_error = "Unknown content length";
task->error_code = RSPAMD_LENGTH_ERROR;
task->state = WRITE_ERROR;
- return -1;
+ return FALSE;
}
}
- return 0;
+ return TRUE;
}
headern = separate_command (line, ':');
if (line == NULL || headern == NULL) {
- return -1;
+ return FALSE;
}
/* Eat whitespaces */
g_strstrip (headern);
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'd':
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'h':
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'f':
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
+ }
+ break;
+ case 'j':
+ case 'J':
+ /* json */
+ if (g_ascii_strncasecmp (headern, JSON_HEADER, sizeof (JSON_HEADER) - 1) == 0) {
+ task->is_json = parse_flag (memory_pool_fstrdup (task->task_pool, line));
+ }
+ else {
+ msg_info ("wrong header: %s", headern);
+ return FALSE;
}
break;
case 'q':
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'r':
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'i':
tmp = memory_pool_fstrdup (task->task_pool, line);
if (!inet_aton (tmp, &task->from_addr)) {
msg_info ("bad ip header: '%s'", tmp);
- return -1;
+ return FALSE;
}
debug_task ("read IP header, value: %s", tmp);
}
else {
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
break;
case 'p':
msg_info ("pass all filters");
}
}
+ else {
+ return FALSE;
+ }
break;
case 's':
case 'S':
task->subject = memory_pool_fstrdup (task->task_pool, line);
}
else {
- return -1;
+ return FALSE;
}
break;
case 'u':
task->user = memory_pool_fstrdup (task->task_pool, line);
}
else {
- return -1;
+ return FALSE;
}
break;
default:
msg_info ("wrong header: %s", headern);
- return -1;
+ return FALSE;
}
- return 0;
+ return TRUE;
}
-gint
+gboolean
read_rspamd_input_line (struct worker_task *task, f_str_t * line)
{
switch (task->state) {
return parse_header (task, line);
break;
default:
- return -1;
+ return FALSE;
}
- return -1;
+ return FALSE;
}
struct metric_callback_data {
return rspamd_dispatcher_write (task->dispatcher, outbuf, cb.off, FALSE, FALSE);
}
+/*
+ * Print a single symbol using rspamc protocol
+ */
static void
-metric_symbols_callback (gpointer key, gpointer value, void *user_data)
+metric_symbols_callback_rspamc (gpointer key, gpointer value, void *user_data)
{
struct metric_callback_data *cd = (struct metric_callback_data *)user_data;
struct worker_task *task = cd->task;
}
static gboolean
-show_metric_symbols (struct metric_result *metric_res, struct metric_callback_data *cd)
+show_metric_symbols_rspamc (struct metric_result *metric_res, struct metric_callback_data *cd)
{
cd->cur_metric = metric_res->metric;
- g_hash_table_foreach (metric_res->symbols, metric_symbols_callback, cd);
+ g_hash_table_foreach (metric_res->symbols, metric_symbols_callback_rspamc, cd);
/* Remove last , from log buf */
if (cd->log_buf[cd->log_offset - 1] == ',') {
cd->log_buf[--cd->log_offset] = '\0';
return TRUE;
}
+/*
+ * JSON symbols output
+ */
static void
-show_metric_result (gpointer metric_name, gpointer metric_value, void *user_data)
+metric_symbols_callback_json (gpointer key, gpointer value, void *user_data)
{
struct metric_callback_data *cd = (struct metric_callback_data *)user_data;
- struct worker_task *task = cd->task;
- gint r = 0;
- gchar outbuf[OUTBUFSIZ];
- struct metric_result *metric_res = (struct metric_result *)metric_value;
- struct metric *m;
- gint is_spam = 0;
- double ms = 0, rs = 0;
- enum rspamd_metric_action action = METRIC_ACTION_NOACTION;
+ gchar *description;
+ struct symbol *s = (struct symbol *)value;
+ GList *cur;
if (! cd->alive) {
return;
}
- if (metric_name == NULL || metric_value == NULL) {
- m = g_hash_table_lookup (task->cfg->metrics, DEFAULT_METRIC);
- default_required_score = m->required_score;
- default_score = 0;
- if (!check_metric_settings (task, m, &ms, &rs)) {
- ms = m->required_score;
- rs = m->reject_score;
+ description = g_hash_table_lookup (cd->cur_metric->descriptions, key);
+
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ CRLF " {" CRLF " \"name\": \"%s\"," CRLF
+ " \"weight\": %.2f," CRLF,
+ (gchar *)key, s->score);
+ if (description != NULL) {
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ " \"description\": \"%s\"" CRLF, description);
+ }
+ if (s->options) {
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ " \"options\": [" CRLF " ");
+ cur = s->options;
+ while (cur) {
+ if (g_list_next (cur)) {
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ "\"%s\", ", (gchar *)cur->data);
+ }
+ else {
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ "\"%s\"" CRLF " ]" CRLF, (gchar *)cur->data);
+
+ }
+ cur = g_list_next (cur);
}
+ }
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ " },");
+}
+/*
+ * Print a single symbol using json protocol
+ */
+static gboolean
+show_metric_symbols_json (struct metric_result *metric_res, struct metric_callback_data *cd)
+{
+
+ cd->cur_metric = metric_res->metric;
+ cd->symbols_offset = 0;
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ " \"symbols\": [");
+
+ /* Print all symbols */
+ g_hash_table_foreach (metric_res->symbols, metric_symbols_callback_json, cd);
+ /* Remove last ',' symbol */
+ if (cd->symbols_buf[cd->symbols_offset - 1] == ',') {
+ cd->symbols_buf[--cd->symbols_offset] = '\0';
+ }
+ cd->symbols_offset += rspamd_snprintf (cd->symbols_buf + cd->symbols_offset, cd->symbols_size - cd->symbols_offset,
+ CRLF " ]" CRLF " }" CRLF);
+ if (! rspamd_dispatcher_write (cd->task->dispatcher, cd->symbols_buf, cd->symbols_offset, FALSE, FALSE)) {
+ cd->alive = FALSE;
+ }
+ return cd->alive;
+}
+
+/* Print a single metric line */
+static gint
+print_metric_data_rspamc (struct worker_task *task, gchar *outbuf, gsize size,
+ struct metric_result *metric_res,
+ struct metric *m, double ms, double rs,
+ enum rspamd_metric_action action)
+{
+ gint r = 0;
+ gboolean is_spam = FALSE;
+
+ if (metric_res == NULL) {
if (task->proto == SPAMC_PROTO) {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
+ r = rspamd_snprintf (outbuf, size,
"Spam: False ; 0 / %.2f" CRLF, ms);
}
else {
if (task->proto_ver >= 11) {
if (!task->is_skipped) {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
+ r = rspamd_snprintf (outbuf, size,
"Metric: default; False; 0.00 / %.2f / %.2f" CRLF, ms,
rs);
}
else {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
+ r = rspamd_snprintf (outbuf, size,
"Metric: default; Skip; 0.00 / %.2f / %.2f" CRLF, ms,
rs);
}
}
else {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
+ r = rspamd_snprintf (outbuf, size,
"Metric: default; False; 0.00 / %.2f" CRLF, ms);
}
- r += rspamd_snprintf (outbuf + r, sizeof(outbuf) - r,
+ r += rspamd_snprintf (outbuf + r, size - r,
"Action: %s" CRLF, str_action_metric (
METRIC_ACTION_NOACTION));
}
+ }
+ else {
+ is_spam = metric_res->score >= ms;
+
+ if (task->proto == SPAMC_PROTO) {
+ if (task->cmd != CMD_REPORT_IFSPAM || is_spam) {
+ r = rspamd_snprintf (outbuf, size,
+ "Spam: %s ; %.2f / %.2f" CRLF, (is_spam) ? "True"
+ : "False", metric_res->score, ms);
+ }
+ }
+ else {
+ if (task->proto_ver >= 11) {
+ if (!task->is_skipped) {
+ r = rspamd_snprintf (outbuf, size,
+ "Metric: %s; %s; %.2f / %.2f / %.2f" CRLF,
+ (gchar *) m->name,
+ (is_spam) ? "True" : "False", metric_res->score,
+ ms, rs);
+ }
+ else {
+ r = rspamd_snprintf (outbuf, size,
+ "Metric: %s; Skip; %.2f / %.2f / %.2f" CRLF,
+ (gchar *) m->name, metric_res->score, ms, rs);
+ }
+ }
+ else {
+ r = rspamd_snprintf (outbuf, size,
+ "Metric: %s; %s; %.2f / %.2f" CRLF,
+ (gchar *) m->name, (is_spam) ? "True" : "False",
+ metric_res->score, ms);
+ }
+ r += rspamd_snprintf (outbuf + r, size - r,
+ "Action: %s" CRLF, str_action_metric (action));
+ }
+ }
+
+ return r;
+}
+
+/* Print a single metric line in json */
+static gint
+print_metric_data_json (struct worker_task *task, gchar *outbuf, gsize size,
+ struct metric_result *metric_res,
+ struct metric *m, double ms, double rs,
+ enum rspamd_metric_action action)
+{
+ gint r = 0;
+
+
+ if (metric_res == NULL) {
+ r = rspamd_snprintf (outbuf, size,
+ " {" CRLF " \"name\": \"default\"," CRLF
+ " \"is_spam\": false," CRLF
+ " \"is_skipped\": %s," CRLF
+ " \"score\": 0.00," CRLF
+ " \"required_score\": %.2f," CRLF
+ " \"reject_score\": %.2f," CRLF
+ " \"action\": \"%s\"," CRLF,
+ task->is_skipped ? "true" : "false", ms, rs,
+ str_action_metric (METRIC_ACTION_NOACTION));
+ }
+ else {
+ r = rspamd_snprintf (outbuf, size,
+ " {" CRLF " \"name\": \"default\"," CRLF
+ " \"is_spam\": %s," CRLF
+ " \"is_skipped\": %s," CRLF
+ " \"score\": %.2f," CRLF
+ " \"required_score\": %.2f," CRLF
+ " \"reject_score\": %.2f," CRLF
+ " \"action\": \"%s\"," CRLF,
+ metric_res->score >= ms ? "true" : "false",
+ metric_res->score,
+ task->is_skipped ? "true" : "false", ms, rs,
+ str_action_metric (action));
+ }
+
+ return r;
+}
+
+static void
+show_metric_result (gpointer metric_name, gpointer metric_value, void *user_data)
+{
+ struct metric_callback_data *cd = (struct metric_callback_data *)user_data;
+ struct worker_task *task = cd->task;
+
+ gchar outbuf[OUTBUFSIZ];
+ struct metric_result *metric_res = (struct metric_result *)metric_value;
+ struct metric *m;
+ gboolean is_spam;
+ gint r;
+
+ double ms = 0, rs = 0;
+ enum rspamd_metric_action action = METRIC_ACTION_NOACTION;
+
+ if (! cd->alive) {
+ return;
+ }
+ if (metric_name == NULL || metric_value == NULL) {
+ m = g_hash_table_lookup (task->cfg->metrics, DEFAULT_METRIC);
+ default_required_score = m->required_score;
+ default_score = 0;
+ if (!check_metric_settings (task, m, &ms, &rs)) {
+ ms = m->required_score;
+ rs = m->reject_score;
+ }
+
+ if (!task->is_json) {
+ r = print_metric_data_rspamc (task, outbuf, sizeof (outbuf), NULL, m, ms, rs, action);
+ }
+ else {
+ r = print_metric_data_json (task, outbuf, sizeof (outbuf), NULL, m, ms, rs, action);
+ }
+
+ /* Write log line */
if (!task->is_skipped) {
cd->log_offset += rspamd_snprintf (cd->log_buf + cd->log_offset,
cd->log_size - cd->log_offset,
metric_res->metric);
}
- if (metric_res->score >= ms) {
- is_spam = 1;
- }
-
- if (task->proto == SPAMC_PROTO) {
- if (task->cmd != CMD_REPORT_IFSPAM || is_spam) {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
- "Spam: %s ; %.2f / %.2f" CRLF, (is_spam) ? "True"
- : "False", metric_res->score, ms);
- }
+ if (!task->is_json) {
+ r = print_metric_data_rspamc (task, outbuf, sizeof (outbuf), metric_res, metric_res->metric, ms, rs, action);
}
else {
- if (task->proto_ver >= 11) {
- if (!task->is_skipped) {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
- "Metric: %s; %s; %.2f / %.2f / %.2f" CRLF,
- (gchar *) metric_name,
- (is_spam) ? "True" : "False", metric_res->score,
- ms, rs);
- }
- else {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
- "Metric: %s; Skip; %.2f / %.2f / %.2f" CRLF,
- (gchar *) metric_name, metric_res->score, ms, rs);
- }
- }
- else {
- r = rspamd_snprintf (outbuf, sizeof(outbuf),
- "Metric: %s; %s; %.2f / %.2f" CRLF,
- (gchar *) metric_name, (is_spam) ? "True" : "False",
- metric_res->score, ms);
- }
- r += rspamd_snprintf (outbuf + r, sizeof(outbuf) - r,
- "Action: %s" CRLF, str_action_metric (action));
+ r = print_metric_data_json (task, outbuf, sizeof (outbuf), metric_res, metric_res->metric, ms, rs, action);
}
+ /* Write log line */
if (!task->is_skipped) {
+ is_spam = metric_res->score >= ms;
+
cd->log_offset += rspamd_snprintf (cd->log_buf + cd->log_offset,
cd->log_size - cd->log_offset,
"(%s: %c (%s): [%.2f/%.2f/%.2f] [", (gchar *) metric_name,
}
}
if (task->cmd == CMD_PROCESS) {
+ if (task->is_json) {
+ r += rspamd_snprintf (outbuf + r, sizeof (outbuf) - r, "}" CRLF);
+ }
#ifndef GMIME24
g_mime_message_add_header (task->message, "X-Spam-Status", outbuf);
#else
g_mime_object_append_header (GMIME_OBJECT (task->message),
"X-Spam-Status", outbuf);
#endif
+
}
else {
if (!rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
}
if (metric_value != NULL) {
- if (!show_metric_symbols (metric_res, cd)) {
- cd->alive = FALSE;
- return;
+ if (task->is_json) {
+ if (!show_metric_symbols_json (metric_res, cd)) {
+ cd->alive = FALSE;
+ return;
+ }
+ }
+ else {
+ if (!show_metric_symbols_rspamc (metric_res, cd)) {
+ cd->alive = FALSE;
+ return;
+ }
+ }
+ }
+ else {
+ if (task->is_json) {
+ if (!rspamd_dispatcher_write (task->dispatcher, " }" CRLF, 5, FALSE, TRUE)) {
+ cd->alive = FALSE;
+ return;
+ }
}
}
}
struct metric_result *metric_res;
struct metric_callback_data cd;
- r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s 0 %s" CRLF, (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER,
+ /* Output the first line - check status */
+ if (task->is_http) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "HTTP/1.0 200 OK" CRLF "Connection: close" CRLF CRLF);
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE, FALSE)) {
+ return FALSE;
+ }
+ }
+ else {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s 0 %s" CRLF, (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER,
rspamc_proto_str (task->proto_ver), SPAMD_OK);
- if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE, FALSE)) {
- return FALSE;
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE, FALSE)) {
+ return FALSE;
+ }
}
cd.task = task;
}
cd.alive = TRUE;
- if (task->proto == SPAMC_PROTO) {
+ if (task->proto == SPAMC_PROTO && !task->is_http) {
/* Ignore metrics, just write report for 'default' metric */
metric_res = g_hash_table_lookup (task->results, "default");
}
else {
/* Show default metric first */
+ if (task->is_json) {
+ if (! rspamd_dispatcher_write (task->dispatcher, "[" CRLF, 3, TRUE, TRUE)) {
+ return FALSE;
+ }
+ }
metric_res = g_hash_table_lookup (task->results, "default");
if (metric_res == NULL) {
/* Implicit metric result */
if (!cd.alive) {
return FALSE;
}
- /* Messages */
- if (! show_messages (task)) {
- return FALSE;
- }
- /* URL stat */
- if (! show_url_header (task)) {
- return FALSE;
+ if (task->is_json) {
+ if (! rspamd_dispatcher_write (task->dispatcher, "]" CRLF, 3, FALSE, TRUE)) {
+ return FALSE;
+ }
}
- /* Emails stat */
- if (! show_email_header (task)) {
- return FALSE;
+ else {
+ /* XXX: add this for JSON as well */
+ /* Messages */
+ if (! show_messages (task)) {
+ return FALSE;
+ }
+ /* URL stat */
+ if (! show_url_header (task)) {
+ return FALSE;
+ }
+ /* Emails stat */
+ if (! show_email_header (task)) {
+ return FALSE;
+ }
}
}
write_hashes_to_log (task, logbuf, cd.log_offset, cd.log_size);
msg_info ("%s", logbuf);
- if (task->proto == RSPAMC_PROTO && task->proto_ver >= 12) {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), "Message-ID: %s" CRLF CRLF, task->message_id);
- if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
- return FALSE;
- }
- }
- else if (task->proto == SPAMC_PROTO && task->cmd == CMD_SYMBOLS) {
- len = strlen (cd.symbols_buf);
- r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF "%s" CRLF,
- len + sizeof (CRLF) - 1, cd.symbols_buf);
- if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
- return FALSE;
- }
- }
-
- if (task->cmd == CMD_REPORT || task->cmd == CMD_REPORT_IFSPAM) {
- if (default_score >= default_required_score) {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
- "This message is likely spam" CRLF "%s",
- sizeof ("This message is likely spam" CRLF) - 1 + cd.report_offset,
- cd.report_buf);
- }
- else if (default_score > 0.01) {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
- "This message is probably spam" CRLF "%s",
- sizeof ("This message is probably spam" CRLF) - 1 + cd.report_offset,
- cd.report_buf);
+ if (!task->is_json) {
+ /* Write message id */
+ if (task->proto == RSPAMC_PROTO && task->proto_ver >= 12) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "Message-ID: %s" CRLF CRLF, task->message_id);
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
+ return FALSE;
+ }
}
- else {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
- "This message is not spam" CRLF "%s",
- sizeof ("This message is not spam" CRLF) - 1 + cd.report_offset,
- cd.report_buf);
+ /* Write symbols for spamc proto */
+ else if (task->proto == SPAMC_PROTO && task->cmd == CMD_SYMBOLS) {
+ len = strlen (cd.symbols_buf);
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF "%s" CRLF,
+ len + sizeof (CRLF) - 1, cd.symbols_buf);
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
+ return FALSE;
+ }
}
- if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
- return FALSE;
+ /* Write report, based on score of default metric */
+ if (task->cmd == CMD_REPORT || task->cmd == CMD_REPORT_IFSPAM) {
+ if (default_score >= default_required_score) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
+ "This message is likely spam" CRLF "%s",
+ sizeof ("This message is likely spam" CRLF) - 1 + cd.report_offset,
+ cd.report_buf);
+ }
+ else if (default_score > 0.01) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
+ "This message is probably spam" CRLF "%s",
+ sizeof ("This message is probably spam" CRLF) - 1 + cd.report_offset,
+ cd.report_buf);
+ }
+ else {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), CONTENT_LENGTH_HEADER ": %d" CRLF CRLF
+ "This message is not spam" CRLF "%s",
+ sizeof ("This message is not spam" CRLF) - 1 + cd.report_offset,
+ cd.report_buf);
+ }
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE)) {
+ return FALSE;
+ }
}
}
+ /* Increase counters */
task->worker->srv->stat->messages_scanned++;
if (default_score >= default_required_score) {
task->worker->srv->stat->messages_spam ++;
struct metric_result *metric_res;
struct metric_callback_data cd;
- r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s 0 %s" CRLF,
- (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER,
- rspamc_proto_str (task->proto_ver), SPAMD_OK);
+ /* Output the first line - check status */
+ if (task->is_http) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "HTTP/1.0 200 OK" CRLF "Connection: close" CRLF CRLF);
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE, FALSE)) {
+ return FALSE;
+ }
+ }
+ else {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s 0 %s" CRLF, (task->proto == SPAMC_PROTO) ? SPAMD_REPLY_BANNER : RSPAMD_REPLY_BANNER,
+ rspamc_proto_str (task->proto_ver), SPAMD_OK);
+ if (! rspamd_dispatcher_write (task->dispatcher, outbuf, r, TRUE, FALSE)) {
+ return FALSE;
+ }
+ }
cd.task = task;
cd.log_buf = logbuf;
write_hashes_to_log (task, logbuf, cd.log_offset, cd.log_size);
msg_info ("%s", logbuf);
+ /* Now prepare and write message itself */
outmsg = g_mime_object_to_string (GMIME_OBJECT (task->message));
memory_pool_add_destructor (task->task_pool, (pool_destruct_func) g_free, outmsg);
debug_task ("writing reply to client");
if (task->error_code != 0) {
/* Write error message and error code to reply */
- if (task->proto == SPAMC_PROTO) {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s %d %s" CRLF CRLF,
- SPAMD_REPLY_BANNER, rspamc_proto_str (task->proto_ver), task->error_code, SPAMD_ERROR);
- debug_task ("writing error: %s", outbuf);
+ if (task->is_http) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "HTTP/1.0 400 Bad request" CRLF
+ "Connection: close" CRLF CRLF);
}
else {
- r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s %d %s" CRLF "%s: %s" CRLF CRLF,
- RSPAMD_REPLY_BANNER, rspamc_proto_str (task->proto_ver), task->error_code, SPAMD_ERROR, ERROR_HEADER, task->last_error);
- debug_task ("writing error: %s", outbuf);
+ if (task->proto == SPAMC_PROTO) {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s %d %s" CRLF CRLF,
+ SPAMD_REPLY_BANNER, rspamc_proto_str (task->proto_ver), task->error_code, SPAMD_ERROR);
+ debug_task ("writing error: %s", outbuf);
+ }
+ else {
+ r = rspamd_snprintf (outbuf, sizeof (outbuf), "%s/%s %d %s" CRLF "%s: %s" CRLF CRLF,
+ RSPAMD_REPLY_BANNER, rspamc_proto_str (task->proto_ver), task->error_code, SPAMD_ERROR, ERROR_HEADER, task->last_error);
+ debug_task ("writing error: %s", outbuf);
+ }
}
/* Write to bufferevent error message */
return rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE);
projects / rspamd.git / commitdiff