From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 9 Sep 2019 16:13:12 +0000 (+0100)
Subject: [Project] Lua_magic: Use lua_magic for multimap as well
X-Git-Tag: 2.0~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10155c997eb4120efc4f35eacb63ba5a45431c3f;p=thirdparty%2Frspamd.git

[Project] Lua_magic: Use lua_magic for multimap as well
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index ae97afeb81..7afe6dfb44 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -873,21 +873,14 @@ local function multimap_callback(task, rule)
           match_filename(rule, fn)
         end
         -- Also deal with detected content type
-        local dtype,dsubtype = p:get_detected_type()
-        if not rule.skip_detected and (dtype and dsubtype) then
-          local detected_ct = string.format('%s/%s', dtype, dsubtype)
-
-          if detected_ct then
-            local lua_mime = require "lua_mime"
-
-            local ext = lua_mime.reversed_extensions_map[detected_ct]
-
-            if ext then
-              local fake_fname = string.format('detected.%s', ext)
-              lua_util.debugm(N, task, 'detected filename %s (%s content-type)',
-                  fake_fname, detected_ct)
-              match_filename(rule, fake_fname)
-            end
+        if not rule.skip_detected then
+          local ext = p:get_detected_ext()
+
+          if ext then
+            local fake_fname = string.format('detected.%s', ext)
+            lua_util.debugm(N, task, 'detected filename %s',
+                fake_fname)
+            match_filename(rule, fake_fname)
           end
         end
       end