CIRCL
/
PyCIRCLean
mirror of https://github.com/CIRCL/PyCIRCLean
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:CIRCL/PyCIRCLean

pull/26/head
Raphaël Vinot 2019-08-29 10:53:19 +02:00
parent 2b576964e3 87e734b567
commit 4234c183c8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filecheck/filecheck.py
View File

@ -192,9 +192,11 @@ class File(FileBase):
expected_mimetypes = [expected_mimetype] expected_mimetypes = [expected_mimetype]
if expected_mimetype in Config.aliases: if expected_mimetype in Config.aliases:
expected_mimetypes.append(Config.aliases[expected_mimetype]) expected_mimetypes.append(Config.aliases[expected_mimetype])
if (encoding is None) and (os.path.getsize(self.src_path) == 0):
is_empty_file = True
is_known_extension = self.extension in mimetypes.types_map.keys() is_known_extension = self.extension in mimetypes.types_map.keys()
if is_known_extension and self.mimetype not in expected_mimetypes: if is_known_extension and self.mimetype not in expected_mimetypes and not is_empty_file:
self.make_dangerous('Mimetype does not match expected mimetypes ({}) for this extension'.format(expected_mimetypes)) self.make_dangerous('Mimetype does not match expected mimetypes ({}) for this extension'.format(expected_mimetypes))
def _check_mimetype(self): def _check_mimetype(self):