mirrors/opensnitch
1
0
Fork 0
mirror of https://github.com/evilsocket/opensnitch.git synced 2025-03-05 17:10:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

UI: shorten default rules name

Browse source 
Default rules name can be extremely long when the rule is of type list.
It still will be in some cases, but should work in most cases.

closes #37
This commit is contained in:
Gustavo Iñiguez Goia 2020-06-26 22:47:44 +02:00
parent 8494bfd982
commit 97139ecc6b
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/opensnitch/dialogs/prompt.py
View file

@ -361,6 +361,16 @@ class PromptDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]):
self._default_action = self.ACTION_ALLOW self._default_action = self.ACTION_ALLOW
self._send_rule() self._send_rule()
def _get_rule_name(self):
rule_temp_name = slugify("%s %s" % (self._rule.action, self._rule.duration))
if self._ischeckAdvanceded:
rule_temp_name = "%s-list" % rule_temp_name
else:
rule_temp_name = "%s-simple" % rule_temp_name
rule_temp_name = slugify("%s %s" % (rule_temp_name, self._rule.operator.data))
return rule_temp_name
def _send_rule(self): def _send_rule(self):
self._cfg.setSettings("promptDialog/geometry", self.saveGeometry()) self._cfg.setSettings("promptDialog/geometry", self.saveGeometry())
self._rule = ui_pb2.Rule(name="user.choice") self._rule = ui_pb2.Rule(name="user.choice")
@ -373,17 +383,21 @@ class PromptDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]):
what_idx = self.whatCombo.currentIndex() what_idx = self.whatCombo.currentIndex()
self._rule.operator.type, self._rule.operator.operand, self._rule.operator.data = self._get_combo_operator(self.whatCombo, what_idx) self._rule.operator.type, self._rule.operator.operand, self._rule.operator.data = self._get_combo_operator(self.whatCombo, what_idx)
rule_temp_name = self._get_rule_name()
# TODO: move to a method # TODO: move to a method
data=[] data=[]
if self._ischeckAdvanceded and self.checkDstIP.isChecked() and self.whatCombo.itemData(what_idx) != "dst_ip": if self._ischeckAdvanceded and self.checkDstIP.isChecked() and self.whatCombo.itemData(what_idx) != "dst_ip":
_type, _operand, _data = self._get_combo_operator(self.whatIPCombo, self.whatIPCombo.currentIndex()) _type, _operand, _data = self._get_combo_operator(self.whatIPCombo, self.whatIPCombo.currentIndex())
data.append({"type": _type, "operand": _operand, "data": _data}) data.append({"type": _type, "operand": _operand, "data": _data})
rule_temp_name = slugify("%s %s" % (rule_temp_name, _data))
if self._ischeckAdvanceded and self.checkDstPort.isChecked() and self.whatCombo.itemData(what_idx) != "dst_port": if self._ischeckAdvanceded and self.checkDstPort.isChecked() and self.whatCombo.itemData(what_idx) != "dst_port":
data.append({"type": "simple", "operand": "dest.port", "data": str(self._con.dst_port)}) data.append({"type": "simple", "operand": "dest.port", "data": str(self._con.dst_port)})
if self._ischeckAdvanceded and self.checkUserID.isChecked() and self.whatCombo.itemData(what_idx) != "user_id": if self._ischeckAdvanceded and self.checkUserID.isChecked() and self.whatCombo.itemData(what_idx) != "user_id":
data.append({"type": "simple", "operand": "user.id", "data": str(self._con.user_id)}) data.append({"type": "simple", "operand": "user.id", "data": str(self._con.user_id)})
rule_temp_name = slugify("%s %s" % (rule_temp_name, str(self._con.user_id)))
if self._ischeckAdvanceded: if self._ischeckAdvanceded:
data.append({"type": self._rule.operator.type, "operand": self._rule.operator.operand, "data": self._rule.operator.data}) data.append({"type": self._rule.operator.type, "operand": self._rule.operator.operand, "data": self._rule.operator.data})
@ -391,7 +405,7 @@ class PromptDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]):
self._rule.operator.type = "list" self._rule.operator.type = "list"
self._rule.operator.operand = "" self._rule.operator.operand = ""
self._rule.name = slugify("%s %s %s" % (self._rule.action, self._rule.operator.type, self._rule.operator.data)) self._rule.name = rule_temp_name
self.hide() self.hide()
if self._ischeckAdvanceded: if self._ischeckAdvanceded: