Bugfix: GUI/OptionsDialog: fixed qvalidatedlineedit instances proxyIp, proxyPort, proxyIpTor, proxyPortTor to properly validate including visual feedback

Author: bigshiny90

src/qt/optionsdialog.cpp

@@ -720,10 +720,14 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
     /* setup/change UI elements when proxy IPs are invalid/valid */
     ui->proxyIp->setCheckValidator(new ProxyAddressValidator(parent));
     ui->proxyIpTor->setCheckValidator(new ProxyAddressValidator(parent));
+    ui->proxyIp->setAllowEmptyInput(false);
+    ui->proxyIpTor->setAllowEmptyInput(false);
+    ui->proxyPort->setAllowEmptyInput(false);
+    ui->proxyPortTor->setAllowEmptyInput(false);
     connect(ui->proxyIp, &QValidatedLineEdit::validationDidChange, this, &OptionsDialog::updateProxyValidationState);
     connect(ui->proxyIpTor, &QValidatedLineEdit::validationDidChange, this, &OptionsDialog::updateProxyValidationState);
-    connect(ui->proxyPort, &QLineEdit::textChanged, this, &OptionsDialog::updateProxyValidationState);
-    connect(ui->proxyPortTor, &QLineEdit::textChanged, this, &OptionsDialog::updateProxyValidationState);
+    connect(ui->proxyPort, &QValidatedLineEdit::validationDidChange, this, &OptionsDialog::updateProxyValidationState);
+    connect(ui->proxyPortTor, &QValidatedLineEdit::validationDidChange, this, &OptionsDialog::updateProxyValidationState);
 
     if (!QSystemTrayIcon::isSystemTrayAvailable()) {
         ui->showTrayIcon->setChecked(false);
@@ -1152,6 +1156,16 @@ void OptionsDialog::on_okButton_clicked()
         model->setData(model->index(OptionsModel::dustdynamic, 0), "off");
     }
 
+    // Before mapper->submit()
+    if (!ui->connectSocks->isChecked()) {
+        ui->proxyIp->clear();
+        ui->proxyPort->clear();
+    }
+    if (!ui->connectSocksTor->isChecked()) {
+        ui->proxyIpTor->clear();
+        ui->proxyPortTor->clear();
+    }
+
     mapper->submit();
     accept();
     updateDefaultProxyNets();
@@ -1211,17 +1225,47 @@ void OptionsDialog::clearStatusLabel()
 
 void OptionsDialog::updateProxyValidationState()
 {
-    QValidatedLineEdit *pUiProxyIp = ui->proxyIp;
-    QValidatedLineEdit *otherProxyWidget = (pUiProxyIp == ui->proxyIpTor) ? ui->proxyIp : ui->proxyIpTor;
-    if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() || ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() || ui->proxyPortTor->text().toInt() > 0))
+    bool socksProxyEnabled = ui->connectSocks->isChecked();
+    bool torProxyEnabled = ui->connectSocksTor->isChecked();
+
+    bool proxyIpValid = ui->proxyIp->isValid();
+    bool proxyPortValid = ui->proxyPort->isValid();
+    bool proxyIpTorValid = ui->proxyIpTor->isValid();
+    bool proxyPortTorValid = ui->proxyPortTor->isValid();
+
+    // proxy is OK if: disabled OR (enabled AND valid ip and valid port)
+    bool socksProxyOk = !socksProxyEnabled || (proxyIpValid && proxyPortValid);
+    bool torProxyOk = !torProxyEnabled || (proxyIpTorValid && proxyPortTorValid);
+
+    // Clear visual feedback when proxies are disabled
+    if (!socksProxyEnabled) { ui->proxyIp->setStyleSheet(""); ui->proxyPort->setStyleSheet(""); }
+    if (!torProxyEnabled) { ui->proxyIpTor->setStyleSheet(""); ui->proxyPortTor->setStyleSheet(""); }
+
+    // Both must be OK for the form to be valid
+    if (socksProxyOk && torProxyOk)
     {
-        setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxies are valid
+        setOkButtonState(true);
         clearStatusLabel();
     }
     else
     {
         setOkButtonState(false);
-        ui->statusLabel->setText(tr("The supplied proxy address is invalid."));
+        QStringList socksErrors;
+
+        if (socksProxyEnabled) {
+            if (!proxyIpValid || !proxyPortValid) {
+                socksErrors.append(tr("The supplied proxy address and port is invalid."));
+            }
+        }
+        if (torProxyEnabled) {
+            if (!proxyIpTorValid || !proxyPortTorValid) {
+                socksErrors.append(tr("The supplied Tor proxy address and port is invalid."));
+            }
+        }
+
+        if (socksErrors.size() > 0) {
+            ui->statusLabel->setText(socksErrors.join(" "));
+        }
     }
 }
 
@@ -1278,6 +1322,22 @@ QValidator::State ProxyAddressValidator::validate(QString &input, int &pos) cons
     std::string hostname;
     if (!SplitHostPort(input.toStdString(), port, hostname) || port != 0) return QValidator::Invalid;
 
+    // Check for incomplete IPv4 addresses using the extracted hostname
+    size_t dotCount = std::count(hostname.begin(), hostname.end(), '.');
+
+    // If it contains dots, it's trying to be an IPv4 address
+    if (dotCount > 0) {
+        // IPv4 must have exactly 3 dots (4 octets)
+        if (dotCount != 3) {
+            return QValidator::Invalid;  // Reject "127.0", "192.168.1", etc.
+        }
+        // Also verify it's numeric (digits and dots only)
+        if (!std::all_of(hostname.begin(), hostname.end(),
+            [](char c) { return (c >= '0' && c <= '9') || c == '.'; })) {
+            return QValidator::Invalid;
+        }
+    }
+
     CService serv(LookupNumeric(input.toStdString(), DEFAULT_GUI_PROXY_PORT));
     Proxy addrProxy = Proxy(serv, true);
     if (addrProxy.IsValid())