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 2

Sort the perms

Browse source
This commit is contained in:
twangboy 2019-08-08 10:27:32 -06:00
parent b4caaad4a0
commit b8fa7d33a5
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/utils/win_dacl.py
View file

@ -931,6 +931,7 @@ def dacl(obj_name=None, obj_type='file'):
if ace[1] & perm == perm:
ace_perms.append(
self.ace_perms[obj_type]['advanced'][perm])
ace_perms.sort()
# If still nothing, it must be undefined
if not ace_perms:

14
tests/unit/utils/test_win_dacl.py
View file

@ -295,10 +295,10 @@ class WinDaclRegTestCase(TestCase, LoaderModuleMockMixin):
'NETWORK SERVICE': {
'deny': {
'applies to': 'This key and subkeys',
'permissions': ['Set Value',
'Delete',
'Write Owner',
'Write DAC']}}}}
'permissions': ['Delete',
'Set Value',
'Write DAC',
'Write Owner']}}}}
self.assertDictEqual(
win_dacl.get_permissions(
obj_name=self.obj_name,
@ -595,10 +595,10 @@ class WinDaclFileTestCase(TestCase, LoaderModuleMockMixin):
'NETWORK SERVICE': {
'deny': {
'applies to': 'Not Inherited (file)',
'permissions': ['Delete',
'permissions': ['Change permissions',
'Create files / write data',
'Write attributes',
'Change permissions']}}}}
'Delete',
'Write attributes']}}}}
self.assertDictEqual(
win_dacl.get_permissions(
obj_name=self.obj_name,