diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-13 15:09:19 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-13 15:09:19 +0100 |
| commit | 6597e51e5a56e7285a41041bb4b80b98ef4b8773 (patch) | |
| tree | 24adf7b63a7d1b9f0139211e8c51b5d47498a892 /src/plugins/fuzzy_check.c | |
| parent | 6dcd2bd6760bdf33c953d89e5c6752a3154bd4ab (diff) | |
| download | rspamd-6597e51e5a56e7285a41041bb4b80b98ef4b8773.tar.gz rspamd-6597e51e5a56e7285a41041bb4b80b98ef4b8773.zip | |
[Minor] Further fuzzy check empty parts fixes
Diffstat (limited to 'src/plugins/fuzzy_check.c')
| -rw-r--r-- | src/plugins/fuzzy_check.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index b39563dce..8400186c4 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -2121,7 +2121,9 @@ fuzzy_insert_metric_results (struct rspamd_task *task, GPtrArray *results) { struct fuzzy_client_result *res; guint i; - gboolean seen_text_hash = FALSE, seen_img_hash = FALSE, seen_text = FALSE, + gboolean seen_text_hash = FALSE, + seen_img_hash = FALSE, + seen_text_part = FALSE, seen_long_text = FALSE; gdouble prob_txt = 0.0, mult; struct rspamd_mime_text_part *tp; @@ -2141,18 +2143,21 @@ fuzzy_insert_metric_results (struct rspamd_task *task, GPtrArray *results) if (task->message) { PTR_ARRAY_FOREACH (MESSAGE_FIELD (task, text_parts), i, tp) { - if (!IS_PART_EMPTY (tp)) { - seen_text = TRUE; - } - else if (tp->utf_stripped_text.magic == UTEXT_MAGIC) { - if (utext_isLengthExpensive (&tp->utf_stripped_text)) { - seen_long_text = - utext_nativeLength (&tp->utf_stripped_text) > text_length_cutoff; - } - else { - /* Cannot directly calculate length */ - seen_long_text = - tp->utf_stripped_content->len / 2 > text_length_cutoff; + if (!IS_PART_EMPTY (tp) && tp->utf_words->len > RSPAMD_SHINGLE_SIZE) { + seen_text_part = TRUE; + + if (tp->utf_stripped_text.magic == UTEXT_MAGIC) { + if (utext_isLengthExpensive (&tp->utf_stripped_text)) { + seen_long_text = + utext_nativeLength (&tp->utf_stripped_text) > + text_length_cutoff; + } + else { + /* Cannot directly calculate length */ + seen_long_text = + (tp->utf_stripped_content->len / 2) > + text_length_cutoff; + } } } } @@ -2166,7 +2171,7 @@ fuzzy_insert_metric_results (struct rspamd_task *task, GPtrArray *results) if (seen_long_text) { mult *= 0.25; } - else if (seen_text) { + else if (seen_text_part) { /* We have some short text + image */ mult *= 0.9; } |