From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 11 Apr 2016 15:04:19 +0000 (+0100)
Subject: [Feature] Implement SA compatible body regexps
X-Git-Tag: 1.2.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d2110ba0dd0f7e5d2e9d7a2914ba193336130c;p=thirdparty%2Frspamd.git

[Feature] Implement SA compatible body regexps
---

diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index beb420a730..2e3a2ff653 100644
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -723,6 +723,7 @@ rspamd_re_cache_exec_re (struct rspamd_task *task,
 	guint *lenvec;
 	gboolean raw = FALSE;
 	struct mime_text_part *part;
+	struct mime_part *mime_part;
 	struct rspamd_url *url;
 	struct rspamd_re_cache *cache = rt->cache;
 	gpointer k, v;
@@ -920,6 +921,45 @@ rspamd_re_cache_exec_re (struct rspamd_task *task,
 		debug_task ("checking rawbody regexp: %s -> %d",
 				rspamd_regexp_get_pattern (re), ret);
 		break;
+	case RSPAMD_RE_SABODY:
+		/*
+		 * For SA body we get all parts and extract headers + body from them
+		 *
+		 */
+		if (task->parts->len > 0) {
+			scvec = g_malloc (sizeof (*scvec) * task->parts->len * 2);
+			lenvec = g_malloc (sizeof (*lenvec) * task->parts->len * 2);
+
+			for (i = 0; i < task->parts->len; i++) {
+				mime_part = g_ptr_array_index (task->parts, i);
+
+				if (mime_part->raw_headers_str) {
+					scvec[i * 2] = (guchar *)mime_part->raw_headers_str;
+					lenvec[i * 2] = strlen (mime_part->raw_headers_str);
+				}
+				else {
+					scvec[i * 2] = (guchar *)"";
+					lenvec[i * 2] = 0;
+				}
+
+				if (mime_part->content) {
+					scvec[i * 2 + 1] = (guchar *)mime_part->content->data;
+					lenvec[i * 2 + 1] = mime_part->content->len;
+				}
+				else {
+					scvec[i * 2 + 1] = (guchar *)"";
+					lenvec[i * 2 + 1] = 0;
+				}
+			}
+
+			ret = rspamd_re_cache_process_regexp_data (rt, re,
+					task->task_pool, scvec, lenvec, task->parts->len * 2, TRUE);
+			debug_task ("checking sa body regexp: %s -> %d",
+					rspamd_regexp_get_pattern (re), ret);
+			g_free (scvec);
+			g_free (lenvec);
+		}
+		break;
 	case RSPAMD_RE_MAX:
 		msg_err_task ("regexp of class invalid has been called: %s",
 				rspamd_regexp_get_pattern (re));
@@ -1057,6 +1097,9 @@ rspamd_re_cache_type_to_string (enum rspamd_re_type type)
 	case RSPAMD_RE_URL:
 		ret = "url";
 		break;
+	case RSPAMD_RE_SABODY:
+		ret = "sa body";
+		break;
 	case RSPAMD_RE_MAX:
 		ret = "invalid class";
 		break;
@@ -1095,6 +1138,9 @@ rspamd_re_cache_type_from_string (const char *str)
 		else if (strcmp (str, "mimeheader") == 0) {
 			ret = RSPAMD_RE_MIMEHEADER;
 		}
+		else if (strcmp (str, "sabody") == 0) {
+			ret = RSPAMD_RE_SABODY;
+		}
 	}
 
 	return ret;
diff --git a/src/libserver/re_cache.h b/src/libserver/re_cache.h
index 2628990378..e211834e53 100644
--- a/src/libserver/re_cache.h
+++ b/src/libserver/re_cache.h
@@ -33,6 +33,7 @@ enum rspamd_re_type {
 	RSPAMD_RE_RAWMIME,
 	RSPAMD_RE_URL,
 	RSPAMD_RE_BODY,
+	RSPAMD_RE_SABODY,
 	RSPAMD_RE_MAX
 };