AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: avoid potential proxy settings deserialization problems (fixes #8652)

Browse Source
This commit is contained in:
Sander van Grieken
2023-11-24 15:06:23 +01:00
parent 6f9e86a1ac
commit ab9c3bb9b4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/qt/network_dialog.py
View File

@@ -33,7 +33,7 @@ from PyQt5.QtCore import Qt, pyqtSignal, QThread
from PyQt5.QtWidgets import (QTreeWidget, QTreeWidgetItem, QMenu, QGridLayout, QComboBox, from PyQt5.QtWidgets import (QTreeWidget, QTreeWidgetItem, QMenu, QGridLayout, QComboBox,
QLineEdit, QDialog, QVBoxLayout, QHeaderView, QCheckBox, QLineEdit, QDialog, QVBoxLayout, QHeaderView, QCheckBox,
QTabWidget, QWidget, QLabel) QTabWidget, QWidget, QLabel)
from PyQt5.QtGui import QFontMetrics from PyQt5.QtGui import QIntValidator
from electrum.i18n import _ from electrum.i18n import _
from electrum import constants, blockchain, util from electrum import constants, blockchain, util
@@ -53,6 +53,7 @@ _logger = get_logger(__name__)
protocol_names = ['TCP', 'SSL'] protocol_names = ['TCP', 'SSL']
protocol_letters = 'ts' protocol_letters = 'ts'
class NetworkDialog(QDialog, QtEventListener): class NetworkDialog(QDialog, QtEventListener):
def __init__(self, *, network: Network, config: 'SimpleConfig'): def __init__(self, *, network: Network, config: 'SimpleConfig'):
QDialog.__init__(self) QDialog.__init__(self)
@@ -243,6 +244,9 @@ class NetworkChoiceLayout(object):
self.proxy_host.setFixedWidth(fixed_width_hostname) self.proxy_host.setFixedWidth(fixed_width_hostname)
self.proxy_port = QLineEdit() self.proxy_port = QLineEdit()
self.proxy_port.setFixedWidth(fixed_width_port) self.proxy_port.setFixedWidth(fixed_width_port)
self.proxy_port_validator = QIntValidator(1, 65535)
self.proxy_port.setValidator(self.proxy_port_validator)
self.proxy_user = QLineEdit() self.proxy_user = QLineEdit()
self.proxy_user.setPlaceholderText(_("Proxy user")) self.proxy_user.setPlaceholderText(_("Proxy user"))
self.proxy_password = PasswordLineEdit() self.proxy_password = PasswordLineEdit()
@@ -427,6 +431,10 @@ class NetworkChoiceLayout(object):
def set_proxy(self): def set_proxy(self):
net_params = self.network.get_parameters() net_params = self.network.get_parameters()
if self.proxy_cb.isChecked(): if self.proxy_cb.isChecked():
if not self.proxy_port.hasAcceptableInput():
return
if ':' in self.proxy_host.text(): # avoid deserialization pitfall
return
proxy = {'mode':str(self.proxy_mode.currentText()).lower(), proxy = {'mode':str(self.proxy_mode.currentText()).lower(),
'host':str(self.proxy_host.text()), 'host':str(self.proxy_host.text()),
'port':str(self.proxy_port.text()), 'port':str(self.proxy_port.text()),