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

Merge remote-tracking branch 'origin/pr/247'

Browse Source 
* origin/pr/247:
  Fixed overzealous firewall hostname checking
This commit is contained in:
Marek Marczykowski-Górecki 2020-07-15 18:34:21 +02:00
commit 5322cfd1e3
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
qubesmanager/firewall.py
View File

@ -31,55 +31,12 @@ class FirewallModifiedOutsideError(ValueError):
pass pass
class QIPAddressValidator(QtGui.QValidator):
# pylint: disable=too-few-public-methods
def __init__(self, parent=None):
super(QIPAddressValidator, self).__init__(parent)
def validate(self, input_string, pos):
# pylint: disable=too-many-return-statements,no-self-use
hostname = str(input_string)
if len(hostname) > 255 or not hostname:
return QtGui.QValidator.Intermediate, input_string, pos
if hostname == "*":
return QtGui.QValidator.Acceptable, input_string, pos
unmask = hostname.split("/", 1)
if len(unmask) == 2:
hostname = unmask[0]
mask = unmask[1]
if mask.isdigit() or mask == "":
if re.match(r"^([0-9]{1,3}\.){3}[0-9]{1,3}$", hostname) is None:
return QtGui.QValidator.Invalid, input_string, pos
if mask != "":
mask = int(unmask[1])
if mask < 0 or mask > 32:
return QtGui.QValidator.Invalid, input_string, pos
else:
return QtGui.QValidator.Invalid, input_string, pos
if hostname[-1:] == ".":
hostname = hostname[:-1]
if hostname[-1:] == "-":
return QtGui.QValidator.Intermediate, input_string, pos
allowed = re.compile(r"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
if all(allowed.match(x) for x in hostname.split(".")):
return QtGui.QValidator.Acceptable, input_string, pos
return QtGui.QValidator.Invalid, input_string, pos
class NewFwRuleDlg(QtWidgets.QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg): class NewFwRuleDlg(QtWidgets.QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
def __init__(self, parent=None): def __init__(self, parent=None):
super(NewFwRuleDlg, self).__init__(parent) super(NewFwRuleDlg, self).__init__(parent)
self.setupUi(self) self.setupUi(self)
self.set_ok_state(False) self.set_ok_state(False)
self.addressComboBox.setValidator(QIPAddressValidator())
self.addressComboBox.editTextChanged.connect( self.addressComboBox.editTextChanged.connect(
self.address_editing_finished) self.address_editing_finished)
self.serviceComboBox.setValidator(QtGui.QRegExpValidator( self.serviceComboBox.setValidator(QtGui.QRegExpValidator(
@ -94,8 +51,8 @@ class NewFwRuleDlg(QtWidgets.QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
def try_to_create_rule(self): def try_to_create_rule(self):
# return True if successful, False otherwise # return True if successful, False otherwise
address = str(self.addressComboBox.currentText()) address = str(self.addressComboBox.currentText().strip())
service = str(self.serviceComboBox.currentText()) service = str(self.serviceComboBox.currentText().strip())
rule = qubesadmin.firewall.Rule(None, action='accept') rule = qubesadmin.firewall.Rule(None, action='accept')