Merge remote-tracking branch 'origin/pr/370'

* origin/pr/370: firewall log_error: handle all exceptions, allow runuser to be in /sbin
QubesOS · May 4, 2022 · 6f7f9ed · 6f7f9ed
2 parents 6cfc3b3 + 3f20f86
commit 6f7f9ed
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qubesagent/firewall.py b/qubesagent/firewall.py
@@ -198,13 +198,13 @@ def log_error(self, msg):
                 ['runuser', '-u', user, '--', 'notify-send', '-t', '8000',
                     '--icon=network-error', msg],
                 env={'DISPLAY': ':0',
-                    'PATH': '/usr/sbin:/usr/bin',
+                    'PATH': '/usr/sbin:/usr/bin:/sbin:/bin',
                     #dbus address is needed on fedora, but optional on debian
                     'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/{}/bus'.format(
                         uid)},
                 stderr=subprocess.STDOUT,
             )
-        except subprocess.SubprocessError as e:
+        except Exception as e:
             self.log.error(
                 'Failed to notify the user about: {} ({})'.format(
                     msg, str(e)