python/sepolicy: add missing booleans to man pages
get_bools should return a list of booleans that can affect given type, but it did not handle non trivial conditional statements properly (returning the whole conditional statement instead of a list of booleans in the statement). e.g. for allow httpd_t spamc_t:process transition; [ httpd_can_check_spam && httpd_can_sendmail ]:True get_bools used to return [("httpd_can_check_spam && httpd_can_sendmail", False)] instead of [("httpd_can_check_spam", False), ("httpd_can_sendmail", False)] - rename "boolean" in sepolicy rule dictionary to "booleans" to suggest it can contain multiple values and make sure it is populated correctly - add "conditional" key to the rule dictionary to accommodate get_conditionals, which requires the whole conditional statement - extend get_bools search to dontaudit rules so that it covers booleans like httpd_dontaudit_search_dirs Note: get_bools uses security_get_boolean_active to get the boolean value, but the value is later used to represent the default. Not ideal, but I'm not aware of a way to get the actual defaults. Fixes: "sepolicy manpage" generates man pages that are missing booleans which are included in non trivial conditional expressions e.g. httpd_selinux(8) does not include httpd_can_check_spam, httpd_tmp_exec, httpd_unified, or httpd_use_gpg This fix, however, also adds some not strictly related booleans to some man pages. e.g. use_nfs_home_dirs and use_samba_home_dirs are added to httpd_selinux(8) Signed-off-by: Vit Mojzis <vmojzis@redhat.com> Acked-by: Jason Zaman <jason@perfinion.com>
This commit is contained in:
parent
986a3fe27e
commit
7506771e4b
1 changed files with 13 additions and 8 deletions
|
@ -335,7 +335,12 @@ def _setools_rule_to_dict(rule):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
try:
|
try:
|
||||||
d['boolean'] = [(str(rule.conditional), enabled)]
|
d['booleans'] = [(str(b), b.state) for b in rule.conditional.booleans]
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
d['conditional'] = str(rule.conditional)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -440,12 +445,12 @@ def get_conditionals(src, dest, tclass, perm):
|
||||||
x['source'] in src_list and
|
x['source'] in src_list and
|
||||||
x['target'] in dest_list and
|
x['target'] in dest_list and
|
||||||
set(perm).issubset(x[PERMS]) and
|
set(perm).issubset(x[PERMS]) and
|
||||||
'boolean' in x,
|
'conditional' in x,
|
||||||
get_all_allow_rules()))
|
get_all_allow_rules()))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
for i in allows:
|
for i in allows:
|
||||||
tdict.update({'source': i['source'], 'boolean': i['boolean']})
|
tdict.update({'source': i['source'], 'conditional': (i['conditional'], i['enabled'])})
|
||||||
if tdict not in tlist:
|
if tdict not in tlist:
|
||||||
tlist.append(tdict)
|
tlist.append(tdict)
|
||||||
tdict = {}
|
tdict = {}
|
||||||
|
@ -459,10 +464,10 @@ def get_conditionals_format_text(cond):
|
||||||
|
|
||||||
enabled = False
|
enabled = False
|
||||||
for x in cond:
|
for x in cond:
|
||||||
if x['boolean'][0][1]:
|
if x['conditional'][1]:
|
||||||
enabled = True
|
enabled = True
|
||||||
break
|
break
|
||||||
return _("-- Allowed %s [ %s ]") % (enabled, " || ".join(set(map(lambda x: "%s=%d" % (x['boolean'][0][0], x['boolean'][0][1]), cond))))
|
return _("-- Allowed %s [ %s ]") % (enabled, " || ".join(set(map(lambda x: "%s=%d" % (x['conditional'][0], x['conditional'][1]), cond))))
|
||||||
|
|
||||||
|
|
||||||
def get_types_from_attribute(attribute):
|
def get_types_from_attribute(attribute):
|
||||||
|
@ -716,9 +721,9 @@ def get_boolean_rules(setype, boolean):
|
||||||
boollist = []
|
boollist = []
|
||||||
permlist = search([ALLOW], {'source': setype})
|
permlist = search([ALLOW], {'source': setype})
|
||||||
for p in permlist:
|
for p in permlist:
|
||||||
if "boolean" in p:
|
if "booleans" in p:
|
||||||
try:
|
try:
|
||||||
for b in p["boolean"]:
|
for b in p["booleans"]:
|
||||||
if boolean in b:
|
if boolean in b:
|
||||||
boollist.append(p)
|
boollist.append(p)
|
||||||
except:
|
except:
|
||||||
|
@ -1141,7 +1146,7 @@ def get_bools(setype):
|
||||||
bools = []
|
bools = []
|
||||||
domainbools = []
|
domainbools = []
|
||||||
domainname, short_name = gen_short_name(setype)
|
domainname, short_name = gen_short_name(setype)
|
||||||
for i in map(lambda x: x['boolean'], filter(lambda x: 'boolean' in x and x['source'] == setype, get_all_allow_rules())):
|
for i in map(lambda x: x['booleans'], filter(lambda x: 'booleans' in x and x['source'] == setype, search([ALLOW, DONTAUDIT]))):
|
||||||
for b in i:
|
for b in i:
|
||||||
if not isinstance(b, tuple):
|
if not isinstance(b, tuple):
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in a new issue