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

Change rest of lists in Config to tuples

pull/21/head
Dan Puttick 2017-07-19 12:32:36 -04:00
parent 5527cbeeb7
commit fe82a5ac0d
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/filecheck.py
View File

@ -26,23 +26,23 @@ class Config:
"""Configuration information for Filecheck.""" """Configuration information for Filecheck."""
# Application subtypes (mimetype: 'application/<subtype>') # Application subtypes (mimetype: 'application/<subtype>')
mimes_ooxml = ['vnd.openxmlformats-officedocument.'] mimes_ooxml = ('vnd.openxmlformats-officedocument.',)
mimes_office = ['msword', 'vnd.ms-'] mimes_office = ('msword', 'vnd.ms-',)
mimes_libreoffice = ['vnd.oasis.opendocument'] mimes_libreoffice = ('vnd.oasis.opendocument',)
mimes_rtf = ['rtf', 'richtext'] mimes_rtf = ('rtf', 'richtext',)
mimes_pdf = ['pdf', 'postscript'] mimes_pdf = ('pdf', 'postscript',)
mimes_xml = ['xml'] mimes_xml = ('xml',)
mimes_ms = ['dosexec'] mimes_ms = ('dosexec',)
mimes_compressed = ['zip', 'rar', 'bzip2', 'lzip', 'lzma', 'lzop', mimes_compressed = ('zip', 'rar', 'bzip2', 'lzip', 'lzma', 'lzop',
'xz', 'compress', 'gzip', 'tar'] 'xz', 'compress', 'gzip', 'tar',)
mimes_data = ['octet-stream'] mimes_data = ('octet-stream',)
# Image subtypes # Image subtypes
mimes_exif = ['image/jpeg', 'image/tiff'] mimes_exif = ('image/jpeg', 'image/tiff',)
mimes_png = ['image/png'] mimes_png = ('image/png',)
# Mimetypes with metadata # Mimetypes with metadata
mimes_metadata = ['image/jpeg', 'image/tiff', 'image/png'] mimes_metadata = ('image/jpeg', 'image/tiff', 'image/png',)
# Commonly used malicious extensions # Commonly used malicious extensions
# Sources: http://www.howtogeek.com/137270/50-file-extensions-that-are-potentially-dangerous-on-windows/ # Sources: http://www.howtogeek.com/137270/50-file-extensions-that-are-potentially-dangerous-on-windows/
@ -113,7 +113,7 @@ class Config:
# It works as expected if you do mimetypes.guess_type('application/gzip', strict=False) # It works as expected if you do mimetypes.guess_type('application/gzip', strict=False)
override_ext = {'.gz': 'application/gzip'} override_ext = {'.gz': 'application/gzip'}
ignored_mimes = ['inode', 'model', 'multipart', 'example'] ignored_mimes = ('inode', 'model', 'multipart', 'example',)
class File(FileBase): class File(FileBase):
@ -331,7 +331,6 @@ class File(FileBase):
if self.subtype in self.app_subtype_methods: if self.subtype in self.app_subtype_methods:
method = self.app_subtype_methods[self.subtype] method = self.app_subtype_methods[self.subtype]
method() method()
# TODO: should these application methods return a value?
else: else:
self._unknown_app() self._unknown_app()

3
tests/test_filecheck.py
View File

@ -95,6 +95,7 @@ def get_filename(sample_file):
def src_dir_path(tmpdir_factory): def src_dir_path(tmpdir_factory):
return tmpdir_factory.mktemp('src').strpath return tmpdir_factory.mktemp('src').strpath
@fixture(scope='module') @fixture(scope='module')
def dest_dir_path(tmpdir_factory): def dest_dir_path(tmpdir_factory):
return tmpdir_factory.mktemp('dest').strpath return tmpdir_factory.mktemp('dest').strpath
@ -121,6 +122,8 @@ def test_sample_files(mock_logger, sample_file, groomer, dest_dir_path):
file_dest_path = os.path.join(dest_dir_path, sample_file.filename) file_dest_path = os.path.join(dest_dir_path, sample_file.filename)
file = File(sample_file.path, file_dest_path, mock_logger) file = File(sample_file.path, file_dest_path, mock_logger)
groomer.process_file(file) groomer.process_file(file)
print(file.description_string)
print(file.mimetype)
assert file.is_dangerous == sample_file.exp_dangerous assert file.is_dangerous == sample_file.exp_dangerous