]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Do not treat ASiC files as pure archives
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 17 Jun 2021 13:01:43 +0000 (14:01 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 17 Jun 2021 13:01:43 +0000 (14:01 +0100)
Issue: #3790
Closes: #3790
lualib/lua_magic/heuristics.lua
lualib/lua_magic/types.lua

index 01fa046c081e2697bf3d6ed6a3365dcc6f9d8389..4943d53922bff0c3bb993e81adb41b58229cb7c4 100644 (file)
@@ -57,6 +57,7 @@ local zip_patterns = {
   odp = {[[mimetypeapplication/vnd\.oasis\.opendocument\.presentation]]},
   epub = {[[epub\+zip]]},
   asice = {[[mimetypeapplication/vnd\.etsi\.asic-e\+zipPK]]},
+  asics = {[[mimetypeapplication/vnd\.etsi\.asic-s\+zipPK]]},
 }
 
 local txt_trie
index 5ab50d9bce646b1e9763967084b3cbaa9eebb576..9f64b12a2cceab6472d6a3dbdde17acbe6e2f73e 100644 (file)
@@ -125,11 +125,6 @@ local types = {
     ct = 'application/x-alz',
     type = 'archive',
   },
-  -- https://en.wikipedia.org/wiki/Associated_Signature_Containers
-  asice = {
-    ct = 'application/vnd.etsi.asic-e+zip',
-    type = 'archive'
-  },
   xar = {
     ct = 'application/x-xar',
     type = 'archive',
@@ -227,6 +222,15 @@ local types = {
     ct = 'application/vnd.oasis.opendocument.presentation',
     type = 'office'
   },
+  -- https://en.wikipedia.org/wiki/Associated_Signature_Containers
+  asice = {
+    ct = 'application/vnd.etsi.asic-e+zip',
+    type = 'office'
+  },
+  asics = {
+    ct = 'application/vnd.etsi.asic-s+zip',
+    type = 'office'
+  },
   -- other
   pgp = {
     ct = 'application/encrypted',