[Minor] Lua_magic: Add types for .jar and for .apk

diff --git a/lualib/lua_magic/heuristics.lua b/lualib/lua_magic/heuristics.lua
index 8fb83bb0d619a6a986c262112bae0ec6e359092a..70093205119dfaaba1179c579e459c6ab76b8b9c 100644 (file)
--- a/lualib/lua_magic/heuristics.lua
+++ b/lualib/lua_magic/heuristics.lua
@@ -244,7 +244,8 @@ local function detect_archive_flaw(part, arch, log_obj)
     jar = 0,
     odt = 0,
     odp = 0,
-    ods = 0
+    ods = 0,
+    apk = 0,
   } -- ext + confidence pairs
 
   -- General msoffice patterns
@@ -268,6 +269,8 @@ local function detect_archive_flaw(part, arch, log_obj)
         res.pptx = res.pptx + 30
       elseif file == 'META-INF/MANIFEST.MF' then
         res.jar = res.jar + 40
+      elseif file == 'AndroidManifest.xml' then
+        res.apk = res.apk + 60
       end
     end
 

diff --git a/lualib/lua_magic/types.lua b/lualib/lua_magic/types.lua
index 2b2545d872818cf92492b726affc83d4eb87424d..5626b3445faddedf8b09c2686f8d341b64da6c23 100644 (file)
--- a/lualib/lua_magic/types.lua
+++ b/lualib/lua_magic/types.lua
@@ -39,6 +39,14 @@ local types = {
     ct = 'application/x-java-applet',
     type = 'executable',
   },
+  jar = {
+    ct = 'application/java-archive',
+    type = 'archive',
+  },
+  apk = {
+    ct = 'application/vnd.android.package-archive',
+    type = 'archive',
+  },
   -- text
   rtf = {
     ct = "application/rtf",