From e6ae9ca6efb4a30d020ebf273970260a663a7078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20I=C3=B1iguez=20Goia?= Date: Wed, 8 Nov 2023 13:58:59 +0100 Subject: [PATCH] ui: use raw strings notation to for regexps and silence python3.12 warnings. --- ui/opensnitch/desktop_parser.py | 2 +- ui/opensnitch/dialogs/prompt.py | 6 +++--- ui/opensnitch/dialogs/ruleseditor.py | 10 +++++----- ui/opensnitch/utils/__init__.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/opensnitch/desktop_parser.py b/ui/opensnitch/desktop_parser.py index 13450d03..d0cfad24 100644 --- a/ui/opensnitch/desktop_parser.py +++ b/ui/opensnitch/desktop_parser.py @@ -48,7 +48,7 @@ class LinuxDesktopParser(threading.Thread): def _parse_exec(self, cmd): try: - is_flatpak = re.search("^/usr/[s]*bin/flatpak.*--command=([a-zA-Z0-9-_\/\.\+]+)", cmd) + is_flatpak = re.search(r"^/usr/[s]*bin/flatpak.*--command=([a-zA-Z0-9-_\/\.\+]+)", cmd) if is_flatpak: return is_flatpak.group(1) diff --git a/ui/opensnitch/dialogs/prompt.py b/ui/opensnitch/dialogs/prompt.py index ef073327..e8bbfb6b 100644 --- a/ui/opensnitch/dialogs/prompt.py +++ b/ui/opensnitch/dialogs/prompt.py @@ -620,14 +620,14 @@ class PromptDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]): parts = combo.currentText().split(' ') text = parts[len(parts)-1] # ^(|.*\.)yahoo\.com - dsthost = '\.'.join(text.split('.')).replace("*", "") - dsthost = "^(|.*\.)%s" % dsthost[2:] + dsthost = r'\.'.join(text.split('.')).replace("*", "") + dsthost = r"^(|.*\.)%s" % dsthost[2:] return Config.RULE_TYPE_REGEXP, Config.OPERAND_DEST_HOST, dsthost elif combo.itemData(what_idx) == self.FIELD_REGEX_IP: parts = combo.currentText().split(' ') text = parts[len(parts)-1] - return Config.RULE_TYPE_REGEXP, Config.OPERAND_DEST_IP, "%s" % '\.'.join(text.split('.')).replace("*", ".*") + return Config.RULE_TYPE_REGEXP, Config.OPERAND_DEST_IP, "%s" % r'\.'.join(text.split('.')).replace("*", ".*") def _on_action_clicked(self, action): self._default_action = action diff --git a/ui/opensnitch/dialogs/ruleseditor.py b/ui/opensnitch/dialogs/ruleseditor.py index c69541f6..2958ba9b 100644 --- a/ui/opensnitch/dialogs/ruleseditor.py +++ b/ui/opensnitch/dialogs/ruleseditor.py @@ -23,11 +23,11 @@ DIALOG_UI_PATH = "%s/../res/ruleseditor.ui" % os.path.dirname(sys.modules[__name class RulesEditorDialog(QtWidgets.QDialog, uic.loadUiType(DIALOG_UI_PATH)[0]): LOG_TAG = "[rules editor]" - classA_net = "10\.\d{1,3}\.\d{1,3}\.\d{1,3}" - classB_net = "172\.1[6-9]\.\d+\.\d+|172\.2[0-9]\.\d+\.\d+|172\.3[0-1]+\.\d{1,3}\.\d{1,3}" - classC_net = "192\.168\.\d{1,3}\.\d{1,3}" - others_net = "127\.\d{1,3}\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}" - multinets = "2[32][23459]\.\d{1,3}\.\d{1,3}\.\d{1,3}" + classA_net = r"10\.\d{1,3}\.\d{1,3}\.\d{1,3}" + classB_net = r"172\.1[6-9]\.\d+\.\d+|172\.2[0-9]\.\d+\.\d+|172\.3[0-1]+\.\d{1,3}\.\d{1,3}" + classC_net = r"192\.168\.\d{1,3}\.\d{1,3}" + others_net = r"127\.\d{1,3}\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}" + multinets = r"2[32][23459]\.\d{1,3}\.\d{1,3}\.\d{1,3}" MULTICAST_RANGE = "^(" + multinets + ")$" LAN_RANGES = "^(" + others_net + "|" + classC_net + "|" + classB_net + "|" + classA_net + "|::1|f[cde].*::.*)$" LAN_LABEL = "LAN" diff --git a/ui/opensnitch/utils/__init__.py b/ui/opensnitch/utils/__init__.py index 8055958a..87f195ff 100644 --- a/ui/opensnitch/utils/__init__.py +++ b/ui/opensnitch/utils/__init__.py @@ -402,7 +402,7 @@ class NetworkServices(): for line in etcServices: if line[0] == "#": continue - g = re.search("([a-zA-Z0-9\-]+)( |\t)+([0-9]+)\/([a-zA-Z0-9\-]+)(.*)\n", line) + g = re.search(r"([a-zA-Z0-9\-]+)( |\t)+([0-9]+)\/([a-zA-Z0-9\-]+)(.*)\n", line) if g: self.srv_array.append("{0}/{1} {2}".format( g.group(1),