Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug with port numbers and services in VM settings

Browse Source 
Opening an existing FW rule resulted in an invalid port number.
This commit is contained in:
Marta Marczykowska-Górecka 2019-08-09 14:16:30 +02:00
parent f1a1c2cda3
commit dedde71d7a
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesmanager/firewall.py
View File

@ -146,6 +146,7 @@ class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
self.__services = list()
self.port_range_pattern = re.compile(r'\d+-\d+')
self.service_port_pattern = re.compile(r'(\d*) \([a-zA-Z-]*\)')
pattern = re.compile(
r"(?P<name>[a-z][a-z0-9-]+)\s+(?P<port>[0-9]+)/"
@ -394,16 +395,22 @@ class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
.format(service))
return
elif service:
if self.service_port_pattern.fullmatch(service):
parsed_service = self.service_port_pattern.match(
service).groups()[0]
else:
parsed_service = service
try:
rule.dstports = service
rule.dstports = parsed_service
except (TypeError, ValueError):
if self.get_service_port(service) is not None:
rule.dstports = self.get_service_port(service)
if self.get_service_port(parsed_service) is not None:
rule.dstports = self.get_service_port(parsed_service)
else:
QtGui.QMessageBox.warning(None,
self.tr("Invalid port or service"),
self.tr("Port number or service '{0}' is invalid.")
.format(service))
.format(parsed_service))
return
if row is not None: