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

Fix FileBase.make_dangerous filename editing 

* make_dangerous should only modify the filename if the file
wasn't previously identified as dangerous
* add_description should only be called if a reason_string
is supplied
pull/16/head
Dan Puttick 2017-07-13 12:55:26 -04:00
parent e19064c83f
commit 27cbdc57bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kittengroomer/helpers.py
View File

@ -157,8 +157,9 @@ class FileBase(object):
""" """
if not self.is_dangerous: if not self.is_dangerous:
self.set_property('dangerous', True) self.set_property('dangerous', True)
self.add_description(reason_string)
self.filename = 'DANGEROUS_{}_DANGEROUS'.format(self.filename) self.filename = 'DANGEROUS_{}_DANGEROUS'.format(self.filename)
if reason_string:
self.add_description(reason_string)
def safe_copy(self, src=None, dst=None): def safe_copy(self, src=None, dst=None):
"""Copy file and create destination directories if needed.""" """Copy file and create destination directories if needed."""
@ -167,6 +168,7 @@ class FileBase(object):
if dst is None: if dst is None:
dst = self.dst_path dst = self.dst_path
try: try:
# TODO: maybe don't check and just mkdir? Is there a way to do this that won't raise an Exception? Can we make shutil automatically make dirs inbetween?
if not os.path.exists(self.dst_dir): if not os.path.exists(self.dst_dir):
os.makedirs(self.dst_dir) os.makedirs(self.dst_dir)
shutil.copy(src, dst) shutil.copy(src, dst)