valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[modules/linux_acl] add mask support

Browse Source
This commit is contained in:
Roman Inflianskas 2015-01-19 19:31:00 +03:00
parent 5f00166315
commit 924243247f
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
salt/modules/linux_acl.py
View File

@ -184,7 +184,22 @@ def wipefacls(*args, **kwargs):
return True
def modfacl(acl_type, acl_name, perms, *args, **kwargs):
def _acl_prefix(acl_type):
prefix = ''
if acl_type.startswith('d'):
prefix = 'd:'
acl_type = acl_type.replace('default:', '')
acl_type = acl_type.replace('d:', '')
if acl_type == 'user' or acl_type == 'u':
prefix += 'u'
elif acl_type == 'group' or acl_type == 'g':
prefix += 'g'
elif acl_type == 'mask' or acl_type == 'm':
prefix += 'm'
return prefix
def modfacl(acl_type, acl_name='', perms='', *args, **kwargs):
'''
Add or modify a FACL for the specified file(s)
@ -206,16 +221,7 @@ def modfacl(acl_type, acl_name, perms, *args, **kwargs):
if recursive:
cmd += ' -R'
prefix = ''
if acl_type.startswith('d'):
prefix = 'd:'
acl_type = acl_type.replace('default:', '')
acl_type = acl_type.replace('d:', '')
if acl_type == 'user' or acl_type == 'u':
prefix += 'u'
elif acl_type == 'group' or acl_type == 'g':
prefix += 'g'
cmd = '{0} {1}:{2}:{3}'.format(cmd, prefix, acl_name, perms)
cmd = '{0} {1}:{2}:{3}'.format(cmd, _acl_prefix(acl_type), acl_name, perms)
for dentry in args:
cmd += ' {0}'.format(dentry)
@ -223,7 +229,7 @@ def modfacl(acl_type, acl_name, perms, *args, **kwargs):
return True
def delfacl(acl_type, acl_name, *args, **kwargs):
def delfacl(acl_type, acl_name='', *args, **kwargs):
'''
Remove specific FACL from the specified file(s)
@ -245,16 +251,7 @@ def delfacl(acl_type, acl_name, *args, **kwargs):
if recursive:
cmd += ' -R'
prefix = ''
if acl_type.startswith('d'):
prefix = 'd:'
acl_type = acl_type.replace('default:', '')
acl_type = acl_type.replace('d:', '')
if acl_type == 'user' or acl_type == 'u':
prefix += 'u'
elif acl_type == 'group' or acl_type == 'g':
prefix += 'g'
cmd = '{0} {1}:{2}'.format(cmd, prefix, acl_name)
cmd = '{0} {1}:{2}'.format(cmd, _acl_prefix(acl_type), acl_name)
for dentry in args:
cmd += ' {0}'.format(dentry)

2
salt/states/linux_acl.py
View File

@ -54,7 +54,7 @@ def present(name, acl_type, acl_name, perms, recurse=False):
if _current_perms[name].get(acl_type, None):
try:
user = [i for i in _current_perms[name][acl_type] if i.keys()[0] == acl_name].pop()
except IndexError:
except AttributeError, IndexError:
user = None
if user: