From 982c273680d3a54580efeb51d8d8e0567d0f28bd Mon Sep 17 00:00:00 2001 From: Maros Barabas Date: Wed, 10 Mar 2010 13:58:37 +0000 Subject: [PATCH] Fixed dBus problems in sectool-gui --- sectool-0.9.4-dbus-fix.patch | 156 +++++++++++++++++++++++++++++++++++ sectool.spec | 7 +- 2 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 sectool-0.9.4-dbus-fix.patch diff --git a/sectool-0.9.4-dbus-fix.patch b/sectool-0.9.4-dbus-fix.patch new file mode 100644 index 0000000..de4da67 --- /dev/null +++ b/sectool-0.9.4-dbus-fix.patch @@ -0,0 +1,156 @@ +diff -up sectool-0.9.4/org.fedoraproject.sectool.mechanism.conf.old sectool-0.9.4/org.fedoraproject.sectool.mechanism.conf +--- sectool-0.9.4/org.fedoraproject.sectool.mechanism.conf.old 2009-09-01 10:20:23.000000000 +0200 ++++ sectool-0.9.4/org.fedoraproject.sectool.mechanism.conf 2010-03-10 14:51:48.564326918 +0100 +@@ -9,7 +9,7 @@ + + + +- ++ + + + +diff -up sectool-0.9.4/org.fedoraproject.sectool.policy.old sectool-0.9.4/org.fedoraproject.sectool.policy +--- sectool-0.9.4/org.fedoraproject.sectool.policy.old 2009-08-24 16:43:10.000000000 +0200 ++++ sectool-0.9.4/org.fedoraproject.sectool.policy 2010-03-10 14:51:51.858326825 +0100 +@@ -20,8 +20,9 @@ + Run level + System policy prevents run level + +- no +- auth_admin ++ no ++ auth_admin_keep ++ auth_admin_keep + + + +@@ -29,9 +30,9 @@ + Run tests + System policy prevents run tests + +- no +- no +- auth_admin ++ auth_admin_keep ++ auth_admin_keep ++ auth_admin_keep + + + +diff -up sectool-0.9.4/src/sectool-gui.py.old sectool-0.9.4/src/sectool-gui.py +--- sectool-0.9.4/src/sectool-gui.py.old 2010-03-10 14:50:07.111201828 +0100 ++++ sectool-0.9.4/src/sectool-gui.py 2010-03-10 14:52:01.219201762 +0100 +@@ -712,10 +712,14 @@ class DBusCaller(object): + + def __init__(self): + ++ #print "DBusCaller::init::start" + self.timeout = -1 ++ self.auth = 0 ++ #print "DBusCaller::init::SystemBus()" + self.bus = dbus.SystemBus () + #self.bus_name = dbus.service.BusName('org.fedoraproject.sectool.mechanism', self.bus) +- self.dbus_action_object = self.bus.get_object ("org.fedoraproject.sectool.mechanism", "/org/fedoraproject/sectool/object") ++ #self.dbus_action_object = self.bus.get_object ("org.fedoraproject.sectool.mechanism", "/org/fedoraproject/sectool/object") ++ #print "DBusCaller::init::end" + + def get_action(self, action): + """ Get action from dbus sectool mechanism """ +@@ -723,7 +727,7 @@ class DBusCaller(object): + + @staticmethod + def error_handler(error): +- #print "ERROR: ", error ++ print "[ASYNC ERROR]: ", error + pass # We will recieve an error that timeout has expired + + @staticmethod +@@ -736,12 +740,16 @@ class DBusCaller(object): + + def close(self): + self.bus.flush() +- self.bus.close() ++ #self.bus.close() # can't close this, cause it will close main loop + + def run( self, args, file ): + +- auth = slip.dbus.polkit.IsSystemBusNameAuthorized( self.bus.get_unique_name(), "org.fedoraproject.sectool.runtests" ) ++ #print "DBusCaller::run::start" ++ #if (self.auth != 1): ++ self.auth = slip.dbus.polkit.IsSystemBusNameAuthorized( self.bus.get_unique_name(), "org.fedoraproject.sectool.runtests" ) ++ #print "DBusCaller::run::auth: \"",self.auth,"\" end" + self.runtests(args, file) ++ #print "DBusCaller::run::end" + + @slip.dbus.polkit.enable_proxy + def runtests( self, args, file ): +@@ -754,7 +762,7 @@ class DBusCaller(object): + [args, file], + reply_handler=self.reply_handler, + error_handler=self.error_handler, +- timeout=0.00) ++ timeout=10) + + + class ThreadHandler(threading.Thread, Handler): +@@ -845,6 +853,9 @@ class ThreadHandler(threading.Thread, Ha + """ + + self.readers = [] ++ # get action from dbus ++ #print "start dbus" ++ self.bus = DBusCaller() + for test in self.__suite: + + self.test = test +@@ -869,12 +880,10 @@ class ThreadHandler(threading.Thread, Ha + + # Block for dbus exceptions handling, here should be all code that manipulate with dBus + try: +- # get action from dbus +- bus = DBusCaller() +- + # Start new thread - reader to listen on socket and update GUI if something from dBus comes up + # We need to call reader here, because of passing bus to close connection and save processes +- reader = Reader( file, test.dsc['HEADER']['NAME'], self.fill_form, self.test_done, iter, bus ) ++ #print "start reader" ++ reader = Reader( file, test.dsc['HEADER']['NAME'], self.fill_form, self.test_done, iter, self.bus ) + reader.start() + # Add reader to readers pool + self.readers.append( reader ) +@@ -886,12 +895,15 @@ class ThreadHandler(threading.Thread, Ha + TODO: Look for async call, this is workaround using 0-timeout + If you use timeout=-1, it will be sequencial, all positives numbers are seconds in float + """ +- +- bus.run( self.__make_dbus_call( test.dsc["HEADER"]["NAME"] ), file ) ++ #print "run start" ++ self.bus.run( self.__make_dbus_call( test.dsc["HEADER"]["NAME"] ), file ) ++ #print "run end" + #bus.call( test.dsc["HEADER"]["NAME"], file ) + except dbus.DBusException, e: + # This should always happend. We need to be stopped by dBus to start new test in separate thread ++ raise e + if 'org.freedesktop.DBus.Error.NoReply' in e.get_dbus_name(): ++ print >>sys.stderr, "Not reply from DBus" + pass # maybe continue ? + # catch Authorization exception + elif 'NotAuthorizedException' in e.get_dbus_name(): +@@ -939,6 +951,7 @@ class ThreadHandler(threading.Thread, Ha + The testing process is going to die .. we have a little time to stop all tests correctly + """ + self.__stopthread.set( ) ++ self.bus.close() + for reader in self.readers: + reader.stop_thread() + +@@ -1056,7 +1069,7 @@ class Reader(threading.Thread): + def stop_thread(self): + + self.stop = True +- self.bus.close() ++ #self.bus.close() + + + diff --git a/sectool.spec b/sectool.spec index 45fd10b..3df460d 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,13 +1,14 @@ Summary: A security audit system and intrusion detection system Name: sectool Version: 0.9.4 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 Source1: sectool.log Patch1: sectool-0.9.2-optflags.patch Patch2: sectool-0.9.4-pk1.patch Patch3: sectool-0.9.4-policykit-fix.patch +Patch4: sectool-0.9.4-dbus-fix.patch License: GPLv2+ Group: Applications/System Requires: gettext coreutils libselinux python-slip-dbus PolicyKit dbus @@ -45,6 +46,7 @@ sectool-gui provides a GTK-based graphical user interface to sectool. %patch1 -p1 -b .optflags %patch2 -p1 -b .pk1 %patch3 -p1 -b .policykit +%patch4 -p1 -b .dbus %build make %{?_smp_mflags} @@ -114,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 10 2010 Maros Barabas - 0.9.4-5 +- fixed dBus problems in sectool-gui + * Thu Nov 19 2009 Maros Barabas - 0.9.4-4 - change dbus sync call to async - removed killing python test scripts