RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gui: fix parsing of "semodule -lfull" in tab Modules 

The output of "semodule -lfull" changed from "module version" to
"priority module kind". Update system-config-selinux to use this new
format in its tab "Policy Module".

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2017-10-01 18:15:15 +02:00 committed by Jason Zaman
parent d689e3dc16
commit 3b5e8fb842
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gui/modulesPage.py
View File

@ -58,7 +58,8 @@ class modulesPage(semanagePage):
self.module_filter.connect("activate", self.filter_changed)
self.audit_enabled = False
self.store = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
self.store = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING,
GObject.TYPE_STRING)
self.view.set_model(self.store)
self.store.set_sort_column_id(0, Gtk.SortType.ASCENDING)
col = Gtk.TreeViewColumn(_("Module Name"), Gtk.CellRendererText(), text=0)
@ -66,7 +67,7 @@ class modulesPage(semanagePage):
col.set_resizable(True)
self.view.append_column(col)
self.store.set_sort_column_id(0, Gtk.SortType.ASCENDING)
col = Gtk.TreeViewColumn(_("Version"), Gtk.CellRendererText(), text=1)
col = Gtk.TreeViewColumn(_("Priority"), Gtk.CellRendererText(), text=1)
self.enable_audit_button = xml.get_object("enableAuditButton")
self.enable_audit_button.connect("clicked", self.enable_audit)
self.new_button = xml.get_object("newModuleButton")
@ -74,6 +75,11 @@ class modulesPage(semanagePage):
col.set_sort_column_id(1)
col.set_resizable(True)
self.view.append_column(col)
self.store.set_sort_column_id(2, Gtk.SortType.ASCENDING)
col = Gtk.TreeViewColumn(_("Kind"), Gtk.CellRendererText(), text=2)
col.set_sort_column_id(2)
col.set_resizable(True)
self.view.append_column(col)
self.store.set_sort_func(1, self.sort_int, "")
status, self.policy_type = selinux.selinux_getpolicytype()
@ -95,16 +101,17 @@ class modulesPage(semanagePage):
self.filter = filter
self.store.clear()
try:
fd = Popen("semodule -l", shell=True, stdout=PIPE).stdout
fd = Popen("semodule -lfull", shell=True, stdout=PIPE).stdout
l = fd.readlines()
fd.close()
for i in l:
module, ver, newline = i.split('\t')
if not (self.match(module, filter) or self.match(ver, filter)):
priority, module, kind = i.decode('utf-8').split()
if not (self.match(module, filter) or self.match(priority, filter)):
continue
iter = self.store.append()
self.store.set_value(iter, 0, module.strip())
self.store.set_value(iter, 1, ver.strip())
self.store.set_value(iter, 1, priority.strip())
self.store.set_value(iter, 2, kind.strip())
except:
pass
self.view.get_selection().select_path((0,))