p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add exception messages during data directory creation

This commit is contained in:
Shreya 2021-05-26 15:22:52 +05:30
parent a89a62cb5c
commit baee74b761
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monkey/monkey_island/cc/environment/data_dir_generator.py
View File

@ -1,14 +1,30 @@
import logging
import os import os
from monkey_island.cc.environment.utils import is_windows_os from monkey_island.cc.environment.utils import is_windows_os
from monkey_island.cc.environment.windows_permissions import set_full_folder_access from monkey_island.cc.environment.windows_permissions import set_full_folder_access
LOG = logging.getLogger(__name__)
def create_data_dir(data_dir: str, create_parent_dirs: bool) -> None: def create_data_dir(data_dir: str, create_parent_dirs: bool) -> None:
if not os.path.isdir(data_dir): if not os.path.isdir(data_dir):
try:
if create_parent_dirs: if create_parent_dirs:
os.makedirs(data_dir, mode=0o700) os.makedirs(data_dir, mode=0o700)
else: else:
os.mkdir(data_dir, mode=0o700) os.mkdir(data_dir, mode=0o700)
except Exception as ex:
LOG.error(
f'Could not create data directory at "{data_dir}" (maybe `$HOME` could not be '
f"resolved?): {str(ex)}"
)
if is_windows_os(): # `mode=0o700` doesn't work on Windows if is_windows_os(): # `mode=0o700` doesn't work on Windows
try:
set_full_folder_access(folder_path=data_dir) set_full_folder_access(folder_path=data_dir)
except Exception as ex:
LOG.error(
f'Data directory was created at "{data_dir}" but permissions could not be '
f"set successfully: {str(ex)}"
)