Merge branch 'evilsocket:master' into daemon-go-rule-lists-operators-caching

Author: nvandamme

.gitignore

@@ -4,4 +4,4 @@
 
 .vscode/
 .idea/
-.DS_Store
+.DS_Store

ui/opensnitch/dialogs/preferences/dialog.py

@@ -147,7 +147,7 @@ def __init__(self, parent=None, appicon=None):
         self.helpButton.setIcon(helpIcon)
         self.dbFileButton.setIcon(openIcon)
 
-        self.comboUIAction.setItemIcon(Config.ACTION_DENY_IDX, denyIcon)
+        self.comboUIAction.setItemIcon(Config.ACTION_DROP_IDX, denyIcon)
         self.comboUIAction.setItemIcon(Config.ACTION_ALLOW_IDX, allowIcon)
         self.comboUIAction.setItemIcon(Config.ACTION_REJECT_IDX, rejectIcon)
 

ui/opensnitch/dialogs/ruleseditor/dialog.py

@@ -894,5 +894,13 @@ def save_rule(self):
 
         if self.ruleNameEdit.text() == "":
             self.rule.name = slugify("%s %s %s" % (self.rule.action, self.rule.operator.type, self.rule.operator.data))
+        elif self._old_rule_name is not None:
+            # If the rule name was auto-generated (starts with an action prefix),
+            # and the action has changed, update the prefix to match the new action.
+            for old_action in (Config.ACTION_ALLOW, Config.ACTION_DENY, Config.ACTION_REJECT):
+                if self._old_rule_name.startswith(old_action + "-") and old_action != self.rule.action:
+                    self.rule.name = self.rule.action + self._old_rule_name[len(old_action):]
+                    self.ruleNameEdit.setText(self.rule.name)
+                    break
 
         return True, ""

ui/opensnitch/plugins/list_subscriptions/__init__.py

@@ -0,0 +1,15 @@
+#   This file is part of OpenSnitch.
+#
+#   OpenSnitch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   OpenSnitch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with OpenSnitch.  If not, see <http://www.gnu.org/licenses/>.
+

ui/opensnitch/plugins/list_subscriptions/_annotations.py

@@ -0,0 +1,57 @@
+from typing import TYPE_CHECKING, Any, Protocol
+
+if TYPE_CHECKING:
+    from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class RuleOperatorLike(Protocol):
+    operand: str
+    data: str | None
+    list: list["RuleOperatorLike"]
+
+
+class RuleLike(Protocol):
+    name: str | None
+    enabled: bool
+    operator: RuleOperatorLike
+
+
+class StatsDialogProto(Protocol):
+    """Typed subset of StatsDialog used by the plugin.
+
+    actionsButton is injected by uic from stats.ui and otherwise appears
+    as unknown to static analyzers.
+    """
+
+    actionsButton: "QtWidgets.QPushButton"
+
+    def windowIcon(self) -> "QtGui.QIcon": ...
+
+
+class RulesEditorDialogProto(Protocol):
+    """Typed subset of RulesEditorDialog used by the plugin controllers."""
+
+    _old_rule_name: str
+    buttonBox: "QtWidgets.QDialogButtonBox"
+    ruleNameEdit: "QtWidgets.QLineEdit"
+    ruleDescEdit: "QtWidgets.QPlainTextEdit"
+    nodesCombo: "QtWidgets.QComboBox"
+    nodeApplyAllCheck: "QtWidgets.QCheckBox"
+    uidCombo: "QtWidgets.QComboBox"
+    uidCheck: "QtWidgets.QCheckBox"
+    enableCheck: "QtWidgets.QCheckBox"
+    durationCombo: "QtWidgets.QComboBox"
+    dstListsCheck: "QtWidgets.QCheckBox"
+    dstListsLine: "QtWidgets.QLineEdit"
+
+    def installEventFilter(self, filterObj: "QtCore.QObject") -> None: ...
+
+    def hide(self) -> None: ...
+
+    def raise_(self) -> None: ...
+
+    def activateWindow(self) -> None: ...
+
+    def new_rule(self) -> None: ...
+
+    def edit_rule(self, records: Any, _addr: str | None = None) -> None: ...

ui/opensnitch/plugins/list_subscriptions/_compat.py

@@ -0,0 +1,10 @@
+"""Runtime compatibility shim for StatsDialog across OpenSnitch versions."""
+
+
+# Runtime class kept for isinstance checks.
+try:
+    from opensnitch.dialogs.events import StatsDialog
+except ImportError:
+    from opensnitch.dialogs.stats import StatsDialog  # type: ignore[assignment]
+
+__all__ = ["StatsDialog"]