RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-04-11 04:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

sepolicy: support non-MLS policy in manpage

Browse Source 
"sepolicy manpage" fails when the system does not use MLS because
using x.context.range_ raises an exception. Avoid using range and levels
when _pol.mls is False.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2017-08-05 18:37:48 +02:00 committed by Stephen Smalley
parent 07d06cc430
commit 908340e8e7
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/sepolicy/sepolicy/__init__.py
View File

@ -207,10 +207,17 @@ def info(setype, name=None):
elif len(ports) == 1: elif len(ports) == 1:
q.ports = (ports[0], ports[0]) q.ports = (ports[0], ports[0])
if _pol.mls:
return ({
'high': x.ports.high,
'protocol': str(x.protocol),
'range': str(x.context.range_),
'type': str(x.context.type_),
'low': x.ports.low,
} for x in q.results())
return ({ return ({
'high': x.ports.high, 'high': x.ports.high,
'protocol': str(x.protocol), 'protocol': str(x.protocol),
'range': str(x.context.range_),
'type': str(x.context.type_), 'type': str(x.context.type_),
'low': x.ports.low, 'low': x.ports.low,
} for x in q.results()) } for x in q.results())
@ -220,11 +227,16 @@ def info(setype, name=None):
if name: if name:
q.name = name q.name = name
if _pol.mls:
return ({
'range': str(x.mls_range),
'name': str(x),
'roles': list(map(str, x.roles)),
'level': str(x.mls_level),
} for x in q.results())
return ({ return ({
'range': str(x.mls_range),
'name': str(x), 'name': str(x),
'roles': list(map(str, x.roles)), 'roles': list(map(str, x.roles)),
'level': str(x.mls_level),
} for x in q.results()) } for x in q.results())
elif setype == BOOLEAN: elif setype == BOOLEAN:

3
python/sepolicy/sepolicy/manpage.py
View File

@ -84,7 +84,8 @@ def get_all_users_info():
for d in allusers_info: for d in allusers_info:
allusers.append(d['name']) allusers.append(d['name'])
users_range[d['name'].split("_")[0]] = d['range'] if 'range' in d:
users_range[d['name'].split("_")[0]] = d['range']
for u in allusers: for u in allusers:
if u not in ["system_u", "root", "unconfined_u"]: if u not in ["system_u", "root", "unconfined_u"]: