Merge branch 'master' into bleepbop/VIRTS-2743/abilities-api-tests

mitre · Sep 1, 2021 · 8f75bd7 · 8f75bd7
2 parents d6b19b5 + 33d9085
commit 8f75bd7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/service/file_svc.py b/app/service/file_svc.py
@@ -70,7 +70,7 @@ async def create_exfil_sub_directory(self, dir_name):
             os.makedirs(path)
         return path
 
-    async def save_multipart_file_upload(self, request, target_dir):
+    async def save_multipart_file_upload(self, request, target_dir, encrypt=True):
         try:
             reader = await request.multipart()
             headers = CIMultiDict(request.headers)
@@ -80,7 +80,7 @@ async def save_multipart_file_upload(self, request, target_dir):
                     break
                 _, filename = os.path.split(field.filename)
                 await self.save_file(filename, bytes(await field.read()), target_dir,
-                                     encoding=headers.get('x-file-encoding'))
+                                     encrypt=encrypt, encoding=headers.get('x-file-encoding'))
                 self.log.debug('Uploaded file %s/%s' % (target_dir, filename))
             return web.Response()
         except Exception as e: