File 0002-src-firewall-config-Break-infinite-loop-wh... of Package firewalld

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-src-firewall-config-Break-infinite-loop-when-firewal.patch of Package firewalld (Revision c91a19a7bab4ee3f45781bb7e7db6641)

Currently displaying revision c91a19a7bab4ee3f45781bb7e7db6641 , Show latest

From 10bcda63d348d1cc8d930a07c7edaf88e0536ed5 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 27 Feb 2018 19:16:25 +0000
Subject: [PATCH 2/2] src: firewall-config: Break infinite loop when firewalld
 is not running

If firewalld is not running then the firewall-config UI will wait
forever until it manages to establish a dbus connection with the
service. However, this is not optimal since it provides no feedback to
the user as to what it is waiting for. It's best to use a reasonable
timeout value like 15 seconds which should be more than enough for the
connection be established. If that does not happen, then we print a
useful message in order for the user to start investigating the reason
behind the failure.

Fixes #299
---
 src/firewall-config | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/firewall-config b/src/firewall-config
index 4ce58b4e..6f2c9fc6 100755
--- a/src/firewall-config
+++ b/src/firewall-config
@@ -89,6 +89,9 @@ class FirewallConfig(object):
         self.connected_label = _("Connection to firewalld established.")
         self.trying_to_connect_label = \
             _("Trying to connect to firewalld, waiting...")
+        self.failed_to_connect_label = \
+            _("Failed to connect to firewalld. Please make sure that the "
+              "service has been started correctly and try again.")
         self.changes_applied_label = _("Changes applied.")
         self.used_by_label = _("Used by network connection '%s'")
         self.default_zone_used_by_label = _("Default zone used by network "
@@ -98,6 +101,7 @@ class FirewallConfig(object):
 
         self.settings = Gio.Settings.new(FIREWALL_CONFIG_SCHEMA)
         self.modified_timer = None
+        self.connection_timer = None
 
         self.zone_connection_editors = { }
         self.zone_interface_editors = { }
@@ -1614,7 +1618,16 @@ class FirewallConfig(object):
                         buttons=(("gtk-ok", 0),("gtk-quit", 1))) == 1:
             self.onQuit()
 
+    def connection_failed(self, msg):
+        if self._dialog("<b>"+_("Error")+"</b>",
+                        message_type=Gtk.MessageType.ERROR, msg=msg,
+                        buttons=[("gtk-quit", 1)]) == 1:
+            self.onQuit()
+
     def connection_changed(self):
+        if self.connection_timer:
+                self.connection_timer = None
+                GLib.source_remove(self.connection_timer)
         if self.fw.connected:
             self.fw.authorizeAll()
             self.statusLabel.set_text(self.connected_label)
@@ -1671,6 +1684,9 @@ class FirewallConfig(object):
             self.waitingWindowLabel.set_text(self.trying_to_connect_label)
             self.waitingWindowSpinner.start()
 
+            self.connection_timer = GLib.timeout_add_seconds(
+                15, self.connection_failed, self.failed_to_connect_label)
+
         self.update_active_zones()
         self.mainPaned.set_sensitive(self.fw.connected)
         # make all entries in options menu (in)sensitive
-- 
2.16.2

Places

File 0002-src-firewall-config-Break-infinite-loop-when-firewal.patch of Package firewalld (Revision c91a19a7bab4ee3f45781bb7e7db6641)

Places