diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-05-18 16:01:29 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-05-18 16:01:29 +0100 |
| commit | f73fddc5f18b254e6ccfc23e2267ba053c4bf328 (patch) | |
| tree | 41767a5e895f46a99369259fbcfaa21f55c2c3a2 | |
| parent | 2af3d8ca3a1fc3a9627e701a0155173c1a685e3c (diff) | |
| download | rspamd-f73fddc5f18b254e6ccfc23e2267ba053c4bf328.tar.gz rspamd-f73fddc5f18b254e6ccfc23e2267ba053c4bf328.zip | |
[Minor] Tweak some checks
| -rw-r--r-- | src/libserver/dkim.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c index 6702309ac..742e4db8b 100644 --- a/src/libserver/dkim.c +++ b/src/libserver/dkim.c @@ -2150,9 +2150,9 @@ rspamd_dkim_canonize_body(struct rspamd_task *task, EVP_DigestUpdate(ctx->body_hash, "", 0); } } - else if (end > start) { + else if (end >= start) { /* Add sanity checks for ctx->len */ - if (ctx->len > 0) { + if (ctx->body_canon_type == DKIM_CANON_SIMPLE && ctx->len > 0) { if (ctx->len < 2 && end - start > 2) { msg_info_task("DKIM l tag is invalid: %d (%d actual size)", (int) ctx->len, (int) (end - start)); return FALSE; @@ -2217,9 +2217,18 @@ rspamd_dkim_canonize_body(struct rspamd_task *task, } } else { + size_t orig_len = remain; + while (rspamd_dkim_relaxed_body_step(ctx, ctx->body_hash, &start, end - start, &remain)) ; + + if (ctx->len > 0 && remain > (double) orig_len * 0.1) { + msg_info_task("DKIM l tag does not cover enough of the body: %d (%d actual size)", + (int) ctx->len, (int) (end - start)); + return FALSE; + } + if (need_crlf) { start = "\r\n"; end = start + 2; |