saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix some more windows tests

Browse source
This commit is contained in:
twangboy 2024-10-04 13:34:26 -06:00 • committed by Daniel Wozniak
parent ec83f5d506
commit 08e56a130a
3 changed files with 178 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/win_file.py
View file

@ -1366,9 +1366,13 @@ def remove(path, force=False):
# If it's a symlink directory, use the rmdir command
os.rmdir(path)
else:
# Twangboy: This is for troubleshooting
is_dir = os.path.isdir(path)
exists = os.path.exists(path)
# This is a directory, list its contents and remove them recursively
for name in os.listdir(path):
item = f"{path}\\{name}"
# If its a normal directory, recurse to remove it's contents
# If it's a normal directory, recurse to remove its contents
remove(item, force)
# rmdir will work now because the directory is empty

119
tests/pytests/functional/states/file/test__check_directory_win.py
View file

@ -2,6 +2,7 @@ import pytest
import salt.states.file as file
import salt.utils.win_dacl as win_dacl
import salt.utils.win_functions as win_functions
pytestmark = [
pytest.mark.windows_whitelisted,
@ -17,15 +18,69 @@ def configure_loader_modules():
}
def test__check_directory_win_owner(tmp_path):
path = str(tmp_path)
@pytest.fixture
def temp_path(tmp_path):
# We need to create a directory that doesn't inherit permissions from the test suite
tmp_path.mkdir(parents=True, exist_ok=True)
win_dacl.set_owner(obj_name=str(tmp_path), principal="Administrators")
assert win_dacl.get_owner(obj_name=str(tmp_path)) == "Administrators"
# We don't want the parent test directory to inherit permissions
win_dacl.set_inheritance(obj_name=str(tmp_path), enabled=False)
assert not win_dacl.get_inheritance(obj_name=str(tmp_path))
# Set these permissions and make sure they're the only ones
win_dacl.set_permissions(
obj_name=str(tmp_path),
principal="Administrators",
permissions="full_control",
access_mode="grant",
reset_perms=True,
protected=True,
)
perms = {
"Inherited": {},
"Not Inherited": {
"Administrators": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
}
},
}
assert win_dacl.get_permissions(obj_name=str(tmp_path)) == perms
# Now we create a directory for testing that does inherit those permissions from the above, new parent directory
test_dir = tmp_path / "test_dir"
test_dir.mkdir()
current_user = win_functions.get_current_user(with_domain=False)
assert win_dacl.get_owner(obj_name=str(test_dir)) == current_user
# We do want the test directory to inherit permissions from the parent directory
assert win_dacl.get_inheritance(obj_name=str(test_dir))
# Make sure the permissions are inherited from the parent
perms = {
"Inherited": {
"Administrators": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
}
},
"Not Inherited": {},
}
assert win_dacl.get_permissions(obj_name=str(test_dir)) == perms
yield test_dir
def test__check_directory_win_owner(temp_path):
path = str(temp_path)
_, comment, changes = file._check_directory_win(name=path, win_owner="Everyone")
assert path in comment
assert changes == {"owner": "Everyone"}
def test__check_directory_win_grant_perms_basic(tmp_path):
path = str(tmp_path)
def test__check_directory_win_grant_perms_basic(temp_path):
path = str(temp_path)
perms = {
"Guest": {
"applies_to": "this_folder_subfolders_files",
@ -45,8 +100,8 @@ def test__check_directory_win_grant_perms_basic(tmp_path):
assert changes == expected
def test__check_directory_win_grant_perms_basic_existing_user(tmp_path):
path = str(tmp_path)
def test__check_directory_win_grant_perms_basic_existing_user(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -60,8 +115,8 @@ def test__check_directory_win_grant_perms_basic_existing_user(tmp_path):
assert changes == expected
def test__check_directory_win_grant_perms_advanced(tmp_path):
path = str(tmp_path)
def test__check_directory_win_grant_perms_advanced(temp_path):
path = str(temp_path)
perms = {
"Guest": {
"applies_to": "this_folder_subfolders_files",
@ -81,8 +136,8 @@ def test__check_directory_win_grant_perms_advanced(tmp_path):
assert changes == expected
def test__check_directory_win_grant_perms_advanced_existing_user(tmp_path):
path = str(tmp_path)
def test__check_directory_win_grant_perms_advanced_existing_user(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -105,8 +160,8 @@ def test__check_directory_win_grant_perms_advanced_existing_user(tmp_path):
assert changes == expected
def test__check_directory_win_grant_perms_basic_no_applies_to(tmp_path):
path = str(tmp_path)
def test__check_directory_win_grant_perms_basic_no_applies_to(temp_path):
path = str(temp_path)
perms = {"Guest": {"perms": "full_control"}}
expected = {"grant_perms": {"Guest": {"permissions": "full_control"}}}
_, comment, changes = file._check_directory_win(name=path, win_perms=perms)
@ -114,8 +169,8 @@ def test__check_directory_win_grant_perms_basic_no_applies_to(tmp_path):
assert changes == expected
def test__check_directory_win_deny_perms_basic(tmp_path):
path = str(tmp_path)
def test__check_directory_win_deny_perms_basic(temp_path):
path = str(temp_path)
perms = {
"Guest": {
"applies_to": "this_folder_subfolders_files",
@ -135,8 +190,8 @@ def test__check_directory_win_deny_perms_basic(tmp_path):
assert changes == expected
def test__check_directory_win_deny_perms_basic_existing_user(tmp_path):
path = str(tmp_path)
def test__check_directory_win_deny_perms_basic_existing_user(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -150,8 +205,8 @@ def test__check_directory_win_deny_perms_basic_existing_user(tmp_path):
assert changes == expected
def test__check_directory_win_deny_perms_advanced(tmp_path):
path = str(tmp_path)
def test__check_directory_win_deny_perms_advanced(temp_path):
path = str(temp_path)
perms = {
"Guest": {
"applies_to": "this_folder_subfolders_files",
@ -171,8 +226,8 @@ def test__check_directory_win_deny_perms_advanced(tmp_path):
assert changes == expected
def test__check_directory_win_deny_perms_advanced_existing_user(tmp_path):
path = str(tmp_path)
def test__check_directory_win_deny_perms_advanced_existing_user(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -195,8 +250,8 @@ def test__check_directory_win_deny_perms_advanced_existing_user(tmp_path):
assert changes == expected
def test__check_directory_win_deny_perms_basic_no_applies_to(tmp_path):
path = str(tmp_path)
def test__check_directory_win_deny_perms_basic_no_applies_to(temp_path):
path = str(temp_path)
perms = {"Guest": {"perms": "full_control"}}
expected = {"deny_perms": {"Guest": {"permissions": "full_control"}}}
_, comment, changes = file._check_directory_win(name=path, win_deny_perms=perms)
@ -204,32 +259,32 @@ def test__check_directory_win_deny_perms_basic_no_applies_to(tmp_path):
assert changes == expected
def test__check_directory_win_inheritance(tmp_path):
path = str(tmp_path)
def test__check_directory_win_inheritance(temp_path):
path = str(temp_path)
expected = {}
_, comment, changes = file._check_directory_win(name=path, win_inheritance=True)
assert path in comment
assert changes == expected
def test__check_directory_win_inheritance_false(tmp_path):
path = str(tmp_path)
def test__check_directory_win_inheritance_false(temp_path):
path = str(temp_path)
expected = {"inheritance": False}
_, comment, changes = file._check_directory_win(name=path, win_inheritance=False)
assert path in comment
assert changes == expected
def test__check_directory_reset_no_non_inherited_users(tmp_path):
path = str(tmp_path)
def test__check_directory_reset_no_non_inherited_users(temp_path):
path = str(temp_path)
expected = {}
_, comment, changes = file._check_directory_win(name=path, win_perms_reset=True)
assert path in comment
assert changes == expected
def test__check_directory_reset_non_inherited_users_grant(tmp_path):
path = str(tmp_path)
def test__check_directory_reset_non_inherited_users_grant(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -252,8 +307,8 @@ def test__check_directory_reset_non_inherited_users_grant(tmp_path):
assert changes == expected
def test__check_directory_reset_non_inherited_users_deny(tmp_path):
path = str(tmp_path)
def test__check_directory_reset_non_inherited_users_deny(temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",

244
tests/pytests/functional/states/file/test_directory_win.py
View file

@ -1,15 +1,6 @@
import os
import pytest
import salt.utils.win_dacl as win_dacl
import salt.utils.win_functions as win_functions
try:
CURRENT_USER = win_functions.get_current_user(with_domain=False)
except NameError:
# Not a Windows Machine
pass
pytestmark = [
pytest.mark.windows_whitelisted,
@ -18,12 +9,64 @@ pytestmark = [
]
def test_directory_new(file, tmp_path):
@pytest.fixture
def temp_path(tmp_path):
# We need to create a directory that doesn't inherit permissions from the test suite
tmp_path.mkdir(parents=True, exist_ok=True)
win_dacl.set_owner(obj_name=str(tmp_path), principal="Administrators")
assert win_dacl.get_owner(obj_name=str(tmp_path)) == "Administrators"
# We don't want the parent test directory to inherit permissions
win_dacl.set_inheritance(obj_name=str(tmp_path), enabled=False)
assert not win_dacl.get_inheritance(obj_name=str(tmp_path))
# Set these permissions and make sure they're the only ones
win_dacl.set_permissions(
obj_name=str(tmp_path),
principal="Administrators",
permissions="full_control",
access_mode="grant",
reset_perms=True,
protected=True,
)
perms = {
"Inherited": {},
"Not Inherited": {
"Administrators": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
}
},
}
assert win_dacl.get_permissions(obj_name=str(tmp_path)) == perms
# Now we create a directory for testing that does inherit those permissions from the above, new parent directory
test_dir = tmp_path / "test_dir"
test_dir.mkdir()
# We do want the test directory to inherit permissions from the parent directory
assert win_dacl.get_inheritance(obj_name=str(test_dir))
# Make sure the permissions are inherited from the parent
perms = {
"Inherited": {
"Administrators": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
}
},
"Not Inherited": {},
}
assert win_dacl.get_permissions(obj_name=str(test_dir)) == perms
yield test_dir
def test_directory_new(file, temp_path):
"""
Test file.directory when the directory does not exist
Should just return "New Dir"
"""
path = os.path.join(tmp_path, "test")
path = str(temp_path / "test")
ret = file.directory(
name=path,
makedirs=True,
@ -41,18 +84,6 @@ def test_directory_new(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
},
"Not Inherited": {
"Administrators": {
@ -61,18 +92,6 @@ def test_directory_new(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
"Guest": {
"deny": {
"applies to": "This folder, subfolders and files",
@ -84,12 +103,12 @@ def test_directory_new(file, tmp_path):
assert permissions == expected
def test_directory_new_no_inherit(file, tmp_path):
def test_directory_new_no_inherit(file, temp_path):
"""
Test file.directory when the directory does not exist
Should just return "New Dir"
"""
path = os.path.join(tmp_path, "test")
path = str(temp_path / "test")
ret = file.directory(
name=path,
makedirs=True,
@ -104,12 +123,12 @@ def test_directory_new_no_inherit(file, tmp_path):
assert permissions["Inherited"] == {}
def test_directory_new_reset(file, tmp_path):
def test_directory_new_reset(file, temp_path):
"""
Test file.directory when the directory does not exist
Should just return "New Dir"
"""
path = os.path.join(tmp_path, "test")
path = str(temp_path / "test")
ret = file.directory(
name=path,
makedirs=True,
@ -128,18 +147,6 @@ def test_directory_new_reset(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
},
"Not Inherited": {
"Administrators": {
@ -159,12 +166,12 @@ def test_directory_new_reset(file, tmp_path):
assert permissions == expected
def test_directory_new_reset_no_inherit(file, tmp_path):
def test_directory_new_reset_no_inherit(file, temp_path):
"""
Test file.directory when the directory does not exist
Should just return "New Dir"
"""
path = os.path.join(tmp_path, "test")
path = str(temp_path / "test")
ret = file.directory(
name=path,
makedirs=True,
@ -196,8 +203,8 @@ def test_directory_new_reset_no_inherit(file, tmp_path):
assert permissions == expected
def test_directory_existing(file, tmp_path):
path = str(tmp_path)
def test_directory_existing(file, temp_path):
path = str(temp_path)
ret = file.directory(
name=path,
makedirs=True,
@ -208,10 +215,9 @@ def test_directory_existing(file, tmp_path):
"deny_perms": {"Guest": {"permissions": ["write_data", "write_attributes"]}},
"grant_perms": {"Everyone": {"permissions": "full_control"}},
}
# We are checking these individually because sometimes it will return an
# owner if it is running under the Administrator account
assert ret["changes"]["deny_perms"] == expected["deny_perms"]
assert ret["changes"]["grant_perms"] == expected["grant_perms"]
# Sometimes an owner will be set, we don't care about the owner
ret["changes"].pop("owner", None)
assert ret["changes"] == expected
permissions = win_dacl.get_permissions(path)
expected = {
"Inherited": {
@ -221,18 +227,6 @@ def test_directory_existing(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
},
"Not Inherited": {
"Administrators": {
@ -241,18 +235,6 @@ def test_directory_existing(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
"Everyone": {
"grant": {
"applies to": "This folder, subfolders and files",
@ -270,8 +252,8 @@ def test_directory_existing(file, tmp_path):
assert permissions == expected
def test_directory_existing_existing_user(file, tmp_path):
path = str(tmp_path)
def test_directory_existing_existing_user(file, temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Everyone",
@ -289,10 +271,9 @@ def test_directory_existing_existing_user(file, tmp_path):
"deny_perms": {"Guest": {"permissions": ["write_data", "write_attributes"]}},
"grant_perms": {"Everyone": {"permissions": "full_control"}},
}
# We are checking these individually because sometimes it will return an
# owner if it is running under the Administrator account
assert ret["changes"]["deny_perms"] == expected["deny_perms"]
assert ret["changes"]["grant_perms"] == expected["grant_perms"]
# Sometimes an owner will be set, we don't care about the owner
ret["changes"].pop("owner", None)
assert ret["changes"] == expected
permissions = win_dacl.get_permissions(path)
expected = {
"Inherited": {
@ -302,18 +283,6 @@ def test_directory_existing_existing_user(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
},
"Not Inherited": {
"Administrators": {
@ -322,18 +291,6 @@ def test_directory_existing_existing_user(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
"Everyone": {
"grant": {
"applies to": "This folder, subfolders and files",
@ -351,8 +308,8 @@ def test_directory_existing_existing_user(file, tmp_path):
assert permissions == expected
def test_directory_existing_no_inherit(file, tmp_path):
path = str(tmp_path)
def test_directory_existing_no_inherit(file, temp_path):
path = str(temp_path)
ret = file.directory(
name=path,
makedirs=True,
@ -365,18 +322,16 @@ def test_directory_existing_no_inherit(file, tmp_path):
"grant_perms": {"Everyone": {"permissions": "full_control"}},
"inheritance": False,
}
# We are checking these individually because sometimes it will return an
# owner if it is running under the Administrator account
assert ret["changes"]["deny_perms"] == expected["deny_perms"]
assert ret["changes"]["grant_perms"] == expected["grant_perms"]
assert ret["changes"]["inheritance"] == expected["inheritance"]
# Sometimes an owner will be set, we don't care about the owner
ret["changes"].pop("owner", None)
assert ret["changes"] == expected
assert not win_dacl.get_inheritance(path)
permissions = win_dacl.get_permissions(path)
assert permissions["Inherited"] == {}
def test_directory_existing_reset(file, tmp_path):
path = str(tmp_path)
def test_directory_existing_reset(file, temp_path):
path = str(temp_path)
win_dacl.set_permissions(
obj_name=path,
principal="Guest",
@ -401,10 +356,9 @@ def test_directory_existing_reset(file, tmp_path):
}
},
}
# We are checking these individually because sometimes it will return an
# owner if it is running under the Administrator account
assert ret["changes"]["grant_perms"] == expected["grant_perms"]
assert ret["changes"]["remove_perms"] == expected["remove_perms"]
# Sometimes an owner will be set, we don't care about the owner
ret["changes"].pop("owner", None)
assert ret["changes"] == expected
permissions = win_dacl.get_permissions(path)
expected = {
"Inherited": {
@ -414,18 +368,6 @@ def test_directory_existing_reset(file, tmp_path):
"permissions": "Full control",
}
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
}
},
},
"Not Inherited": {
"Everyone": {
@ -439,8 +381,8 @@ def test_directory_existing_reset(file, tmp_path):
assert permissions == expected
def test_directory_existing_reset_no_inherit(file, tmp_path):
path = str(tmp_path)
def test_directory_existing_reset_no_inherit(file, temp_path):
path = str(temp_path)
ret = file.directory(
name=path,
makedirs=True,
@ -461,26 +403,12 @@ def test_directory_existing_reset_no_inherit(file, tmp_path):
"permissions": "Full control",
},
},
"SYSTEM": {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
},
},
CURRENT_USER: {
"grant": {
"applies to": "This folder, subfolders and files",
"permissions": "Full control",
},
},
},
}
# We are checking these individually because sometimes it will return an
# owner if it is running under the Administrator account
assert ret["changes"]["deny_perms"] == expected["deny_perms"]
assert ret["changes"]["grant_perms"] == expected["grant_perms"]
assert ret["changes"]["inheritance"] == expected["inheritance"]
assert ret["changes"]["remove_perms"] == expected["remove_perms"]
# Sometimes an owner will be set, we don't care about the owner
ret["changes"].pop("owner", None)
assert ret["changes"] == expected
permissions = win_dacl.get_permissions(path)
expected = {
"Inherited": {},