[Feature] Store headers order

4 files changed, 22 insertions, 8 deletions

diff --git a/src/libmime/message.h b/src/libmime/message.h
index 03e0e8345..22f4fd24d 100644
--- a/src/libmime/message.h
+++ b/src/libmime/message.h
@@ -49,6 +49,7 @@ struct rspamd_mime_part {
 	rspamd_ftok_t parsed_data;
 	struct rspamd_mime_part *parent_part;
 	GHashTable *raw_headers;
+	GQueue *headers_order;
 	gchar *raw_headers_str;
 	gsize raw_headers_len;
 	enum rspamd_cte cte;
diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index 2ea4c0dcb..5044fc013 100644
--- a/src/libmime/mime_headers.c
+++ b/src/libmime/mime_headers.c
@@ -121,7 +121,8 @@ rspamd_mime_header_check_special (struct rspamd_task *task,
 
 static void
 rspamd_mime_header_add (struct rspamd_task *task,
-		GHashTable *target, struct rspamd_mime_header *rh,
+		GHashTable *target, GQueue *order,
+		struct rspamd_mime_header *rh,
 		gboolean check_special)
 {
 	GPtrArray *ar;
@@ -137,6 +138,8 @@ rspamd_mime_header_add (struct rspamd_task *task,
 		msg_debug_task ("add new raw header %s: %s", rh->name, rh->value);
 	}
 
+	g_queue_push_tail (order, rh);
+
 	if (check_special) {
 		rspamd_mime_header_check_special (task, rh);
 	}
@@ -145,7 +148,9 @@ rspamd_mime_header_add (struct rspamd_task *task,
 /* Convert raw headers to a list of struct raw_header * */
 void
 rspamd_mime_headers_process (struct rspamd_task *task, GHashTable *target,
-		const gchar *in, gsize len, gboolean check_newlines)
+		GQueue *order,
+		const gchar *in, gsize len,
+		gboolean check_newlines)
 {
 	struct rspamd_mime_header *nh = NULL;
 	const gchar *p, *c, *end;
@@ -153,7 +158,7 @@ rspamd_mime_headers_process (struct rspamd_task *task, GHashTable *target,
 	gint state = 0, l, next_state = 100, err_state = 100, t_state;
 	gboolean valid_folding = FALSE;
 	guint nlines_count[RSPAMD_TASK_NEWLINES_MAX];
-	guint order = 0;
+	guint norder = 0;
 
 	p = in;
 	end = p + len;
@@ -334,16 +339,16 @@ rspamd_mime_headers_process (struct rspamd_task *task, GHashTable *target,
 
 			/* We also validate utf8 and replace all non-valid utf8 chars */
 			rspamd_mime_charset_utf_enforce (nh->decoded, strlen (nh->decoded));
-			rspamd_mime_header_add (task, target, nh, check_newlines);
-			nh->order = order ++;
+			rspamd_mime_header_add (task, target, order, nh, check_newlines);
+			nh->order = norder ++;
 			state = 0;
 			break;
 		case 5:
 			/* Header has only name, no value */
 			nh->value = "";
 			nh->decoded = "";
-			rspamd_mime_header_add (task, target, nh, check_newlines);
-			nh->order = order ++;
+			rspamd_mime_header_add (task, target, order, nh, check_newlines);
+			nh->order = norder ++;
 			state = 0;
 			break;
 		case 99:
diff --git a/src/libmime/mime_headers.h b/src/libmime/mime_headers.h
index 9e77aa14b..299e84dea 100644
--- a/src/libmime/mime_headers.h
+++ b/src/libmime/mime_headers.h
@@ -47,7 +47,9 @@ struct rspamd_mime_header {
  * @param check_newlines
  */
 void rspamd_mime_headers_process (struct rspamd_task *task, GHashTable *target,
-		const gchar *in, gsize len, gboolean check_newlines);
+		GQueue *order,
+		const gchar *in, gsize len,
+		gboolean check_newlines);
 
 /**
  * Perform rfc2047 decoding of a header
diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 1626cecbe..9b245e35a 100644
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -517,6 +517,7 @@ rspamd_mime_process_multipart_node (struct rspamd_task *task,
 	npart->parent_part = multipart;
 	npart->raw_headers =  g_hash_table_new_full (rspamd_strcase_hash,
 			rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
+	npart->headers_order = g_queue_new ();
 	g_ptr_array_add (multipart->specific.mp.children, npart);
 
 	if (hdr_pos > 0 && hdr_pos < str.len) {
@@ -527,6 +528,7 @@ rspamd_mime_process_multipart_node (struct rspamd_task *task,
 
 			if (task->raw_headers_content.len > 0) {
 				rspamd_mime_headers_process (task, npart->raw_headers,
+						npart->headers_order,
 						npart->raw_headers_str,
 						npart->raw_headers_len,
 						FALSE);
@@ -1032,6 +1034,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 
 			if (task->raw_headers_content.len > 0) {
 				rspamd_mime_headers_process (task, task->raw_headers,
+						task->headers_order,
 						task->raw_headers_content.begin,
 						task->raw_headers_content.len,
 						TRUE);
@@ -1052,6 +1055,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 
 				if (task->raw_headers_content.len > 0) {
 					rspamd_mime_headers_process (task, task->raw_headers,
+							task->headers_order,
 							task->raw_headers_content.begin,
 							task->raw_headers_content.len,
 							TRUE);
@@ -1078,6 +1082,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 		hdr_pos = rspamd_string_find_eoh (&str, &body_pos);
 		npart->raw_headers =  g_hash_table_new_full (rspamd_strcase_hash,
 				rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
+		npart->headers_order = g_queue_new ();
 
 		if (hdr_pos > 0 && hdr_pos < str.len) {
 			npart->raw_headers_str = str.str;
@@ -1086,6 +1091,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 
 			if (npart->raw_headers_len > 0) {
 				rspamd_mime_headers_process (task, npart->raw_headers,
+						npart->headers_order,
 						npart->raw_headers_str,
 						npart->raw_headers_len,
 						FALSE);