diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-05-29 03:14:45 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-05-29 03:14:45 +0400 |
| commit | f73d002c48bd1ba86e1aaf123c41fbc187e24e05 (patch) | |
| tree | 6c95390b4dfe56c2f85ccdf172bce451d43f46ad | |
| parent | 851ffca79a7c57077f93417a4129226e97123a58 (diff) | |
| download | rspamd-f73d002c48bd1ba86e1aaf123c41fbc187e24e05.tar.gz rspamd-f73d002c48bd1ba86e1aaf123c41fbc187e24e05.zip | |
Support of length attribute.
| -rw-r--r-- | src/dkim.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/dkim.c b/src/dkim.c index 492527e2b..f50704722 100644 --- a/src/dkim.c +++ b/src/dkim.c @@ -875,7 +875,7 @@ rspamd_dkim_canonize_header (rspamd_dkim_context_t *ctx, struct worker_task *tas gint rspamd_dkim_check (rspamd_dkim_context_t *ctx, rspamd_dkim_key_t *key, struct worker_task *task) { - const gchar *p, *headers_end = NULL, *end; + const gchar *p, *headers_end = NULL, *end, *body_end; gboolean got_cr = FALSE, got_crlf = FALSE, got_lf = FALSE; GList *cur; gchar *digest; @@ -891,6 +891,7 @@ rspamd_dkim_check (rspamd_dkim_context_t *ctx, rspamd_dkim_key_t *key, struct wo /* First of all find place of body */ p = task->msg->begin; + end = task->msg->begin + task->msg->len; while (p <= end) { @@ -945,7 +946,19 @@ rspamd_dkim_check (rspamd_dkim_context_t *ctx, rspamd_dkim_key_t *key, struct wo } /* Start canonization of body part */ - if (!rspamd_dkim_canonize_body (ctx, headers_end, end)) { + if (headers_end) { + if (ctx->len == 0 || (gint)ctx->len > end - headers_end) { + body_end = end; + } + else { + /* Strip message */ + body_end = headers_end + ctx->len; + } + } + else { + body_end = end; + } + if (!rspamd_dkim_canonize_body (ctx, headers_end, body_end)) { return DKIM_ERROR; } /* Now canonize headers */ |