ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Bugfix for newer policycoreutils-python (eg. RHEL7) (#3569)

Browse source 
The policycoreutils python API for RHEL6 and RHEL7 are sufficiently
different, requiring some additional definitions and specific conversion
that works on old and new implementations.

It also implements a fix for non-ascii error messages (like when using a
French locale configuration).

This fixes #3551.
This commit is contained in:
Dag Wieers 2016-12-01 14:16:18 +01:00 • committed by Matt Clay
parent 335a28443d
commit 367a0c5d99
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/ansible/modules/extras/system/sefcontext.py
View file

@ -81,6 +81,7 @@ RETURN = '''
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils._text import to_native
try: try:
import selinux import selinux
@ -94,21 +95,35 @@ try:
except ImportError: except ImportError:
HAVE_SEOBJECT=False HAVE_SEOBJECT=False
### Add missing entries (backward compatible)
seobject.file_types.update(dict(
a = seobject.SEMANAGE_FCONTEXT_ALL,
b = seobject.SEMANAGE_FCONTEXT_BLOCK,
c = seobject.SEMANAGE_FCONTEXT_CHAR,
d = seobject.SEMANAGE_FCONTEXT_DIR,
f = seobject.SEMANAGE_FCONTEXT_REG,
l = seobject.SEMANAGE_FCONTEXT_LINK,
p = seobject.SEMANAGE_FCONTEXT_PIPE,
s = seobject.SEMANAGE_FCONTEXT_SOCK,
))
### Make backward compatible ### Make backward compatible
option_to_file_type_str = { option_to_file_type_str = dict(
'a': 'all files', a = 'all files',
'b': 'block device', b = 'block device',
'c': 'character device', c = 'character device',
'd': 'directory', d = 'directory',
'f': 'regular file', f = 'regular file',
'l': 'symbolic link', l = 'symbolic link',
's': 'socket file', p = 'named pipe',
'p': 'named pipe', s = 'socket file',
} )
def semanage_fcontext_exists(sefcontext, target, ftype): def semanage_fcontext_exists(sefcontext, target, ftype):
''' Get the SELinux file context mapping definition from policy. Return None if it does not exist. ''' ''' Get the SELinux file context mapping definition from policy. Return None if it does not exist. '''
record = (target, ftype)
# Beware that records comprise of a string representation of the file_type
record = (target, option_to_file_type_str[ftype])
records = sefcontext.get_all() records = sefcontext.get_all()
try: try:
return records[record] return records[record]
@ -160,7 +175,7 @@ def semanage_fcontext_modify(module, result, target, ftype, setype, do_reload, s
except Exception: except Exception:
e = get_exception() e = get_exception()
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, to_native(e)))
if module._diff and prepared_diff: if module._diff and prepared_diff:
result['diff'] = dict(prepared=prepared_diff) result['diff'] = dict(prepared=prepared_diff)
@ -191,7 +206,7 @@ def semanage_fcontext_delete(module, result, target, ftype, do_reload, sestore='
except Exception: except Exception:
e = get_exception() e = get_exception()
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, str(e))) module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, to_native(e)))
if module._diff and prepared_diff: if module._diff and prepared_diff:
result['diff'] = dict(prepared=prepared_diff) result['diff'] = dict(prepared=prepared_diff)
@ -231,9 +246,6 @@ def main():
result = dict(target=target, ftype=ftype, setype=setype, state=state) result = dict(target=target, ftype=ftype, setype=setype, state=state)
# Convert file types to (internally used) strings
ftype = option_to_file_type_str[ftype]
if state == 'present': if state == 'present':
semanage_fcontext_modify(module, result, target, ftype, setype, do_reload, serange, seuser) semanage_fcontext_modify(module, result, target, ftype, setype, do_reload, serange, seuser)
elif state == 'absent': elif state == 'absent':