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

Fixed parsing port ranges in VM settings

Browse Source 
Now service names with dash ('-') in them will be parsed
correctly and not result in an error.

fixes QubesOS/qubes-issues#4766
This commit is contained in:
Marta Marczykowska-Górecka 2019-08-02 16:58:30 +02:00
parent 6cd02b47b3
commit 1d7d51eafd
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubesmanager/firewall.py
View File

@ -109,7 +109,7 @@ class NewFwRuleDlg(QtGui.QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
'http', 'https', 'ftp', 'ftps', 'smtp',
'pop3', 'pop3s', 'imap', 'imaps', 'odmr',
'nntp', 'nntps', 'ssh', 'telnet', 'telnets', 'ntp',
'snmp', 'ldap', 'ldaps', 'irc', 'ircs', 'xmpp-client',
'snmp', 'ldap', 'ldaps', 'irc', 'ircs-u', 'xmpp-client',
'syslog', 'printer', 'nfs', 'x11'
]
for address in example_addresses:
@ -144,6 +144,9 @@ class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
self.__column_names = {0: "Address", 1: "Port/Service", 2: "Protocol", }
self.__services = list()
self.port_range_pattern = re.compile(r'\d+-\d+')
pattern = re.compile(
r"(?P<name>[a-z][a-z0-9-]+)\s+(?P<port>[0-9]+)/"
r"(?P<protocol>[a-z]+)",
@ -380,7 +383,7 @@ class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
elif dialog.udp_radio.isChecked():
rule.proto = 'udp'
if '-' in service:
if self.port_range_pattern.fullmatch(service):
try:
rule.dstports = service
except ValueError: