[Fix] Check for magic when checking for an archive

Issue: #1848
Closes: #1848
MFH: 1.6

diff --git a/src/libmime/archives.c b/src/libmime/archives.c
index 0d24cb28fd328ea61a95d5cbd0c382d5e7cb7ce7..8cd45f0b43d541c46bd3d1ac2dc848dccb76c937 100644 (file)
--- a/src/libmime/archives.c
+++ b/src/libmime/archives.c
@@ -697,7 +697,19 @@ rspamd_archive_cheat_detect (struct rspamd_mime_part *part, const gchar *str,
                        &srch) == 0) {
                if (rspamd_substring_search_caseless (ct->subtype.begin, ct->subtype.len,
                                str, strlen (str)) != -1) {
-                       return TRUE;
+                       /* We still need to check magic, see #1848 */
+                       if (magic_start != NULL) {
+                               if (part->parsed_data.len > magic_len &&
+                                               memcmp (part->parsed_data.begin,
+                                                               magic_start, magic_len) == 0) {
+                                       return TRUE;
+                               }
+                               /* No magic, refuse this type of archive */
+                               return FALSE;
+                       }
+                       else {
+                               return TRUE;
+                       }
                }
        }
 
@@ -709,6 +721,16 @@ rspamd_archive_cheat_detect (struct rspamd_mime_part *part, const gchar *str,
 
                        if (rspamd_lc_cmp (p, str, strlen (str)) == 0) {
                                if (*(p - 1) == '.') {
+                                       if (magic_start != NULL) {
+                                               if (part->parsed_data.len > magic_len &&
+                                                               memcmp (part->parsed_data.begin,
+                                                                               magic_start, magic_len) == 0) {
+                                                       return TRUE;
+                                               }
+                                               /* No magic, refuse this type of archive */
+                                               return FALSE;
+                                       }
+
                                        return TRUE;
                                }
                        }