mirrors/opensnitch
1
0
Fork 0
mirror of https://github.com/evilsocket/opensnitch.git synced 2025-03-04 08:34:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ui: stop scheduled task on exit

Browse source 
On closing the GUI, stop the schedulded tasks to disable temporal rules.
Otherwise the GUI won't exit until all tasks finish.
This commit is contained in:
Gustavo Iñiguez Goia 2025-02-06 23:51:14 +01:00
parent 1a39122c1d
commit b87bc2e826
Failed to generate hash of commit
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ui/opensnitch/service.py
View file

@ -129,6 +129,8 @@ class UIService(ui_pb2_grpc.UIServicer, QtWidgets.QGraphicsObject):
'ports':{}, 'ports':{},
'users':{} 'users':{}
} }
# list of active scheduled tasks to disable temporal rules.
self._sched_tasks = {}
if not start_in_bg: if not start_in_bg:
self._show_gui_if_tray_not_available() self._show_gui_if_tray_not_available()
@ -308,6 +310,10 @@ class UIService(ui_pb2_grpc.UIServicer, QtWidgets.QGraphicsObject):
self._db.close() self._db.close()
self._stop_db_cleaner() self._stop_db_cleaner()
self._stop_plugins() self._stop_plugins()
for k in self._sched_tasks:
self._sched_tasks[k].stop()
self._on_exit() self._on_exit()
def _show_stats_dialog(self): def _show_stats_dialog(self):
@ -732,8 +738,9 @@ class UIService(ui_pb2_grpc.UIServicer, QtWidgets.QGraphicsObject):
elif kwargs['action'] == self.ADD_RULE: elif kwargs['action'] == self.ADD_RULE:
rule = kwargs['rule'] rule = kwargs['rule']
proto, addr = self._get_peer(kwargs['peer']) proto, addr = self._get_peer(kwargs['peer'])
node_addr = "{0}:{1}".format(proto, addr)
self._nodes.add_rule((datetime.now().strftime("%Y-%m-%d %H:%M:%S")), self._nodes.add_rule((datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
"{0}:{1}".format(proto, addr), node_addr,
rule.name, rule.description, str(rule.enabled), rule.name, rule.description, str(rule.enabled),
str(rule.precedence), str(rule.nolog), rule.action, rule.duration, str(rule.precedence), str(rule.nolog), rule.action, rule.duration,
rule.operator.type, str(rule.operator.sensitive), rule.operator.operand, rule.operator.type, str(rule.operator.sensitive), rule.operator.operand,
@ -747,12 +754,22 @@ class UIService(ui_pb2_grpc.UIServicer, QtWidgets.QGraphicsObject):
# disable temporal rules in the db # disable temporal rules in the db
def _disable_temp_rule(args): def _disable_temp_rule(args):
self._nodes.disable_rule(args[0], args[1].name) srv = args[0]
# sched task key
key = args[1]+args[2]
srv._nodes.disable_rule(args[1], args[2].name)
try:
del srv._sched_tasks[key]
except:
pass
timeout = duration.to_seconds(rule.duration) timeout = duration.to_seconds(rule.duration)
if rule.duration == Config.DURATION_ONCE: if rule.duration == Config.DURATION_ONCE:
timeout = 1 timeout = 1
if timeout > 0: if timeout > 0:
ost = OneshotTimer(timeout, _disable_temp_rule, ("{0}:{1}".format(proto, addr), rule,)) ost = OneshotTimer(timeout, _disable_temp_rule, (self, node_addr, rule,))
key = node_addr + rule.name
self._sched_tasks[key] = ost
ost.start() ost.start()
elif kwargs['action'] == self.DELETE_RULE: elif kwargs['action'] == self.DELETE_RULE: