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

island: Remove execute bit from "secure" file creation

This commit is contained in:
Mike Salvatore 2021-06-15 09:29:18 -04:00
parent e90bf52674
commit 8b2c3ef8a3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/server_utils/file_utils.py
View File

@ -65,7 +65,7 @@ def create_secure_file(path: str):
def _create_secure_file_linux(path: str):
try:
mode = stat.S_IRWXU # read/write/execute permissions to owner
mode = stat.S_IRUSR | stat.S_IWUSR
Path(path).touch(mode=mode, exist_ok=False)
except Exception as ex:

8
monkey/tests/unit_tests/monkey_island/cc/server_utils/test_file_utils.py
View File

@ -91,7 +91,7 @@ def test_create_secure_directory__perm_windows(test_path):
def test_create_secure_file__already_created(test_path):
os.close(os.open(test_path, os.O_CREAT, 0o700))
os.close(os.open(test_path, os.O_CREAT, stat.S_IRWXU))
assert os.path.isfile(test_path)
create_secure_file(test_path) # test fails if any exceptions are thrown
@ -105,7 +105,11 @@ def test_create_secure_file__no_parent_dir(test_path_nested):
def test_create_secure_file__perm_linux(test_path):
create_secure_file(test_path)
st = os.stat(test_path)
assert (st.st_mode & 0o777) == stat.S_IRWXU
expected_mode = stat.S_IRUSR | stat.S_IWUSR
actual_mode = st.st_mode & (stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
assert expected_mode == actual_mode
@pytest.mark.skipif(not is_windows_os(), reason="Tests Windows (not Posix) permissions.")