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

Remove self.cur_file from filecheck

pull/16/head
Dan Puttick 2017-07-16 18:36:22 -04:00
parent a47a00d7a9
commit 270597586e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/filecheck.py
View File

@ -659,18 +659,17 @@ class KittenGroomerFileCheck(KittenGroomerBase):
super(KittenGroomerFileCheck, self).__init__(root_src, root_dst) super(KittenGroomerFileCheck, self).__init__(root_src, root_dst)
self.recursive_archive_depth = 0 self.recursive_archive_depth = 0
self.max_recursive_depth = max_recursive_depth self.max_recursive_depth = max_recursive_depth
self.cur_file = None
self.logger = GroomerLogger(root_src, root_dst, debug) self.logger = GroomerLogger(root_src, root_dst, debug)
def process_dir(self, src_dir, dst_dir): def process_dir(self, src_dir, dst_dir):
"""Process a directory on the source key.""" """Process a directory on the source key."""
for srcpath in self.list_files_dirs(src_dir): for srcpath in self.list_files_dirs(src_dir):
if os.path.isdir(srcpath): if not os.path.islink(srcpath) and os.path.isdir(srcpath):
self.logger.add_dir(srcpath) self.logger.add_dir(srcpath)
else: else:
dstpath = os.path.join(dst_dir, os.path.basename(srcpath)) dstpath = os.path.join(dst_dir, os.path.basename(srcpath))
self.cur_file = File(srcpath, dstpath, self.logger) cur_file = File(srcpath, dstpath, self.logger)
self.process_file(self.cur_file) self.process_file(cur_file)
def process_file(self, file): def process_file(self, file):
""" """
@ -702,8 +701,6 @@ class KittenGroomerFileCheck(KittenGroomerBase):
file.make_dangerous('Archive bomb') file.make_dangerous('Archive bomb')
else: else:
tempdir_path = file.make_tempdir() tempdir_path = file.make_tempdir()
# TODO: double check we are properly escaping file.src_path
# otherwise we are running unsanitized user input directly in the shell
command_str = '{} -p1 x "{}" -o"{}" -bd -aoa' command_str = '{} -p1 x "{}" -o"{}" -bd -aoa'
unpack_command = command_str.format(SEVENZ_PATH, unpack_command = command_str.format(SEVENZ_PATH,
file.src_path, tempdir_path) file.src_path, tempdir_path)