ui,pop-ups: improvements

 - Be specific about user's preferences and respect all of them
   properly.
 - reset widgets before rendering a new connection.

Author: gustavo-iniguez-goya

ui/opensnitch/dialogs/prompt/dialog.py

@@ -389,6 +389,7 @@ def _timeout_worker(self):
     @QtCore.pyqtSlot()
     def on_connection_prompt_triggered(self):
         self.stackedWidget.setCurrentIndex(constants.PAGE_MAIN)
+        self.reset_widgets()
         self._render_connection(self._con)
         if self._tick > 0:
             self.show()
@@ -406,6 +407,20 @@ def on_timeout_triggered(self):
         self._timeout_triggered = True
         self._send_rule()
 
+    def reset_widgets(self):
+        self.appNameLabel.setText("")
+        self.appPathLabel.setText("")
+        self.argsLabel.setText("")
+        self.appDescriptionLabel.setText("")
+        self.messageLabel.setText("")
+        self.cwdLabel.setText("")
+        self.sourceIPLabel.setText("")
+        self.destIPLabel.setText("")
+        self.destPortLabel.setText("")
+        self.uidLabel.setText("")
+        self.checksumLabel.setText("")
+        self.labelChecksumStatus.setText("")
+
     def _hide_widget(self, widget, hide):
         widget.setVisible(not hide)
 
@@ -666,7 +681,7 @@ def _send_rule(self):
             if self._rule.operator.operand == Config.OPERAND_PROCESS_COMMAND:
                 proc_args = " ".join(self._con.process_args)
                 proc_args = proc_args.split(" ")
-                if os.path.isabs(proc_args[0]) == False or proc_args[0].startswith("/proc"):
+                if os.path.isabs(proc_args[0]) is False or proc_args[0].startswith("/proc"):
                     is_list_rule = True
                     data.append({"type": Config.RULE_TYPE_SIMPLE, "operand": Config.OPERAND_PROCESS_PATH, "data": str(self._con.process_path)})
 

ui/opensnitch/dialogs/prompt/utils.py

@@ -247,12 +247,20 @@ def set_default_target(combo, con, cfg, app_name, app_args):
     # Sometimes the app_args is empty, so in that case we'll fallback to
     # app_path if it's not empty.
     # Otherwise select the destination port.
-    if int(con.process_id) > 0 and app_name != "" and app_args != "":
+    if saved_target == constants.TARGET_IDX_PID and int(con.process_id) > 0:
+        combo.setCurrentIndex(constants.TARGET_IDX_PID)
+    elif saved_target == constants.TARGET_IDX_UID:
+        combo.setCurrentIndex(constants.TARGET_IDX_UID)
+    elif saved_target == constants.TARGET_IDX_DST_IP:
+        combo.setCurrentIndex(constants.TARGET_IDX_DST_IP)
+    elif saved_target == constants.TARGET_IDX_DST_PORT:
+        combo.setCurrentIndex(constants.TARGET_IDX_DST_PORT)
+    elif int(con.process_id) > 0 and app_name != "" and app_args != "":
         combo.setCurrentIndex(saved_target)
     elif int(con.process_id) > 0 and app_name != "" and app_args == "":
         combo.setCurrentIndex(constants.TARGET_IDX_PROC_PATH)
     else:
-        print("[warning] connection process details incomplete:", con)
+        print("[warning] connection process details incomplete?", con)
         combo.setCurrentIndex(constants.TARGET_IDX_DST_PORT)
 
 def get_combo_operator(data, comboText, con):