From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 16 Sep 2015 14:14:09 +0000 (+0100)
Subject: Match domain name for simple dkim signatures.
X-Git-Tag: 1.0.0~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1c8f70e07c5985c06dcdfd8cebbbaa6e123b931;p=thirdparty%2Frspamd.git

Match domain name for simple dkim signatures.
---

diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index 0263eeb207..dd4242393b 100644
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -1502,7 +1502,17 @@ rspamd_dkim_canonize_header_simple (rspamd_dkim_context_t *ctx,
 			}
 		}
 		else {
-			elt = &g_array_index (to_sign, struct rspamd_dkim_sign_chunk, 0);
+			/* Try to find the proper header by domain */
+			for (i = to_sign->len - 1; i >= 0; i--) {
+				elt = &g_array_index (to_sign,
+						struct rspamd_dkim_sign_chunk,
+						i);
+				if (rspamd_substring_search (elt->begin, elt->len,
+							ctx->domain, strlen (ctx->domain)) != -1) {
+					break;
+				}
+			}
+
 			if (elt->append_crlf) {
 				rspamd_dkim_signature_update (ctx, elt->begin, elt->len + 1);
 			}