ui: display nodes ip and hostname on more places

Added the hostname to the node comboboxes, to help identify them more
easily.

Author: gustavo-iniguez-goya

ui/opensnitch/dialogs/preferences.py

@@ -190,17 +190,7 @@ def showEvent(self, event):
                 self.comboNodeAddress.addItem("unix://%s/osui.sock" % var_run_path)
                 self.comboServerAddr.addItem("unix://%s/osui.sock" % var_run_path)
 
-            self._node_list = self._nodes.get()
-            for addr in self._node_list:
-                self.comboNodes.addItem(addr)
-
-            if len(self._node_list) == 0:
-                self._reset_node_settings()
-                self._set_status_message(QC.translate("preferences", "There're no nodes connected"))
-
-            showNodes = len(self._node_list) > 1
-            self.comboNodes.setVisible(showNodes)
-            self.checkApplyToNodes.setVisible(showNodes)
+            self.load_nodes()
         except Exception as e:
             print(self.LOG_TAG + "exception loading nodes:", e)
 
@@ -257,8 +247,29 @@ def showEvent(self, event):
 
     def show_node_prefs(self, addr):
         self.show()
-        self.comboNodes.setCurrentText(addr)
-        self.tabWidget.setCurrentIndex(self.TAB_NODES)
+        nIdx = self.comboNodes.findData(addr)
+        if nIdx != -1:
+            self.comboNodes.setCurrentIndex(nIdx)
+            self.tabWidget.setCurrentIndex(self.TAB_NODES)
+
+    def load_nodes(self):
+        self._node_list = self._nodes.get()
+        for addr in self._node_list:
+            hostname = self._nodes.get_node_hostname(addr)
+            self.comboNodes.addItem(f"{addr} - {hostname}", addr)
+
+        if len(self._node_list) == 0:
+            self._reset_node_settings()
+            self._set_status_message(QC.translate("preferences", "There're no nodes connected"))
+
+        showNodes = len(self._node_list) > 1
+        self.comboNodes.setVisible(showNodes)
+        self.checkApplyToNodes.setVisible(showNodes)
+
+    def get_node_addr(self):
+        nIdx = self.comboNodes.currentIndex()
+        addr = self.comboNodes.itemData(nIdx)
+        return addr
 
     def _load_langs(self):
         try:
@@ -417,8 +428,8 @@ def _load_ui_settings(self):
         self._load_ui_columns_config()
 
     def _load_node_settings(self):
-        addr = self.comboNodes.currentText()
-        if addr == "":
+        addr = self.get_node_addr()
+        if addr is None:
             return
 
         try:
@@ -506,7 +517,7 @@ def _load_node_settings(self):
 
         except Exception as e:
             print(self.LOG_TAG + "exception loading config: ", e)
-            self._set_status_error(QC.translate("preferences", "Error loading config: {0}".format(e)))
+            self._set_status_error(QC.translate("preferences", "Error loading config {0}: {1}".format(addr, e)))
 
     def _load_node_config(self, addr):
         """load the config of a node before sending it back to the node"""
@@ -904,8 +915,8 @@ def _save_ui_columns_config(self):
         self._cfg.setSettings(Config.STATS_SHOW_COLUMNS, cols)
 
     def _save_nodes_config(self):
-        addr = self.comboNodes.currentText()
-        if (self._node_needs_update or self.checkApplyToNodes.isChecked()) and addr != "":
+        addr = self.get_node_addr()
+        if (self._node_needs_update or self.checkApplyToNodes.isChecked()) and addr is not None:
             self._set_status_message(QC.translate("preferences", "Saving configuration..."))
             try:
                 notif = ui_pb2.Notification(
@@ -929,7 +940,7 @@ def _save_nodes_config(self):
                 self._set_status_error(QC.translate("preferences", "Exception saving config: {0}").format(str(e)))
                 return False
 
-        elif addr == "":
+        elif addr is None:
             self._set_status_message(QC.translate("preferences", "There're no nodes connected"))
             return False
 
@@ -949,7 +960,8 @@ def _save_node_config(self, notifObject, addr):
             # exclude this message if there're more than one node connected
             # XXX: unix:/local is a special name for the node, when the gRPC
             # does not return the correct address of the node.
-            if (self.comboNodes.currentText() != "unix:/local" and self.comboNodes.currentText() != self.comboNodeAddress.currentText()) or \
+            naddr = self.get_node_addr()
+            if (naddr != "unix:/local" and naddr != self.comboNodeAddress.currentText()) or \
                     self.comboServerAddr.currentText() != self.comboNodeAddress.currentText():
                 self._changes_needs_restart = QC.translate("preferences", "Node address changed (update GUI address if needed)")
 

ui/opensnitch/dialogs/ruleseditor.py

@@ -136,7 +136,8 @@ def showEvent(self, event):
         oldUid = self.uidCombo.currentText()
         self.ifaceCombo.clear()
         self.uidCombo.clear()
-        if self._nodes.is_local(self.nodesCombo.currentText()):
+        addr = self.get_node_addr()
+        if addr is not None and self._nodes.is_local(addr):
             self.ifaceCombo.addItems(NetworkInterfaces.list().keys())
             try:
                 for ip in NetworkInterfaces.list().values():
@@ -277,7 +278,8 @@ def _cb_save_clicked(self):
         if rule_name == "":
             return
 
-        node = self.nodesCombo.currentText()
+        #node = self.nodesCombo.currentText()
+        node = self.get_node_addr()
         # avoid to overwrite rules when:
         # - adding a new rule.
         # - when a rule is renamed, i.e., the rule is edited or added and the
@@ -431,15 +433,19 @@ def _is_valid_regex(self, regex):
     def _is_valid_list_path(self, listWidget):
         if listWidget.text() == "":
             return QC.translate("rules", "Lists field cannot be empty")
-        if self._nodes.is_local(self.nodesCombo.currentText()) and \
+        if self._nodes.is_local(self.get_node_addr()) and \
             self.nodeApplyAllCheck.isChecked() == False and \
             os.path.isdir(listWidget.text()) == False:
             return QC.translate("rules", "Lists field must be a directory")
 
         return None
 
     def set_fields_from_connection(self, records):
-        self.nodesCombo.setCurrentText(records.value(ConnFields.Node))
+        nIdx = self.nodesCombo.findData(records.value(ConnFields.Node))
+        if nIdx == -1:
+            self.set_status_error("Unable to load connection, unknown node? ({0})".format(nIdx))
+            return
+        self.nodesCombo.setCurrentIndex(nIdx)
         self.protoCombo.setCurrentText(records.value(ConnFields.Protocol).upper())
         self.srcIPCombo.setCurrentText(records.value(ConnFields.SrcIP))
         self.dstIPCombo.setCurrentText(records.value(ConnFields.DstIP))
@@ -691,7 +697,7 @@ def _load_nodes(self, addr=None):
             self.nodesCombo.clear()
             self._node_list = self._nodes.get()
 
-            if addr != None and addr not in self._node_list:
+            if addr is not None and addr not in self._node_list:
                 Message.ok(QC.translate("rules", "<b>Error loading rule</b>"),
                         QC.translate("rules", "node {0} not connected".format(addr)),
                         QtWidgets.QMessageBox.Icon.Warning)
@@ -701,10 +707,12 @@ def _load_nodes(self, addr=None):
                 self.nodeApplyAllCheck.setVisible(False)
 
             for node in self._node_list:
-                self.nodesCombo.addItem(node)
+                hostname = self._nodes.get_node_hostname(node)
+                self.nodesCombo.addItem(f"{node} - {hostname}", node)
 
-            if addr != None:
-                self.nodesCombo.setCurrentText(addr)
+            nIdx = self.nodesCombo.findData(addr)
+            if nIdx != -1:
+                self.nodesCombo.setCurrentIndex(nIdx)
 
             showNodes = len(self._node_list) > 1
             self.nodesCombo.setVisible(showNodes)
@@ -716,18 +724,24 @@ def _load_nodes(self, addr=None):
 
         return True
 
+    def get_node_addr(self):
+        nIdx = self.nodesCombo.currentIndex()
+        addr = self.nodesCombo.itemData(nIdx)
+        return addr
+
     def _insert_rule_to_db(self, node_addr):
         # the order of the fields doesn't matter here, as long as we use the
         # name of the field.
         self._rules.add_rules(node_addr, [self.rule])
 
     def _add_rule(self):
         try:
+            addr = self.get_node_addr()
             if self.nodeApplyAllCheck.isChecked():
-                for pos in range(self.nodesCombo.count()):
-                    self._insert_rule_to_db(self.nodesCombo.itemText(pos))
+                for idx in range(self.nodesCombo.count()):
+                    self._insert_rule_to_db(self.nodesCombo.itemData(idx))
             else:
-                self._insert_rule_to_db(self.nodesCombo.currentText())
+                self._insert_rule_to_db(addr)
 
             notif = ui_pb2.Notification(
                     id=int(str(time.time()).replace(".", "")),
@@ -737,7 +751,7 @@ def _add_rule(self):
             if self.nodeApplyAllCheck.isChecked():
                 nid = self._nodes.send_notifications(notif, self._notification_callback)
             else:
-                nid = self._nodes.send_notification(self.nodesCombo.currentText(), notif, self._notification_callback)
+                nid = self._nodes.send_notification(addr, notif, self._notification_callback)
 
             self._notifications_sent[nid] = notif
         except Exception as e:
@@ -747,7 +761,7 @@ def _delete_rule(self):
         try:
             # if the rule name has changed, we need to remove the old one
             if self._old_rule_name != self.rule.name:
-                node = self.nodesCombo.currentText()
+                node = self.get_node_addr()
                 old_rule = self.rule
                 old_rule.name = self._old_rule_name
                 if self.nodeApplyAllCheck.isChecked():