summaryrefslogtreecommitdiffstats
path: root/lualib/lua_magic
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2021-06-17 14:01:43 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2021-06-17 14:01:43 +0100
commita9fe8f9048aeb62df8d0caffe67d35a197afeb26 (patch)
treeb5d40a76e2bb99184369e83f1e6b4ee7adcf7724 /lualib/lua_magic
parent8062da9e666ca4f040f31fd4dfc0571f10c715d9 (diff)
downloadrspamd-a9fe8f9048aeb62df8d0caffe67d35a197afeb26.tar.gz
rspamd-a9fe8f9048aeb62df8d0caffe67d35a197afeb26.zip
[Minor] Do not treat ASiC files as pure archives
Issue: #3790 Closes: #3790
Diffstat (limited to 'lualib/lua_magic')
-rw-r--r--lualib/lua_magic/heuristics.lua1
-rw-r--r--lualib/lua_magic/types.lua14
2 files changed, 10 insertions, 5 deletions
diff --git a/lualib/lua_magic/heuristics.lua b/lualib/lua_magic/heuristics.lua
index 01fa046c0..4943d5392 100644
--- a/lualib/lua_magic/heuristics.lua
+++ b/lualib/lua_magic/heuristics.lua
@@ -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
diff --git a/lualib/lua_magic/types.lua b/lualib/lua_magic/types.lua
index 5ab50d9bc..9f64b12a2 100644
--- a/lualib/lua_magic/types.lua
+++ b/lualib/lua_magic/types.lua
@@ -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',