Remove SSL proxy option from GUI (#1249)

IB-7979 Signed-off-by: Raul Metsma <[email protected]>
open-eid · Mar 22, 2024 · 8ab22d4 · 8ab22d4
1 parent 6acdef8
commit 8ab22d4
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/client/Application.cpp b/client/Application.cpp
@@ -144,8 +144,6 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 	}
 
 #ifdef Q_OS_MAC
-	bool proxyTunnelSSL() const final
-	{ return Settings::PROXY_TUNNEL_SSL.value(digidoc::XmlConfCurrent::proxyTunnelSSL()); }
 	std::string TSLCache() const final
 	{ return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation).toStdString(); }
 
@@ -157,8 +155,6 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 	{ Settings::PROXY_USER = user; }
 	void setProxyPass( const std::string &pass ) final
 	{ Settings::PROXY_PASS = pass; }
-	void setProxyTunnelSSL( bool enable ) final
-	{ Settings::PROXY_TUNNEL_SSL.setValue(enable, digidoc::XmlConfCurrent::proxyTunnelSSL()); }
 #endif
 
 	std::vector<digidoc::X509Cert> TSCerts() const final
@@ -597,7 +593,6 @@ QVariant Application::confValue( ConfParameter parameter, const QVariant &value
 	case ProxyPort: r = i->proxyPort().c_str(); break;
 	case ProxyUser: r = i->proxyUser().c_str(); break;
 	case ProxyPass: r = i->proxyPass().c_str(); break;
-	case ProxySSL: return i->proxyTunnelSSL();
 	case TSAUrl: r = i->TSUrl().c_str(); break;
 	case TSLUrl: r = i->TSLUrl().c_str(); break;
 	case TSLCache: r = i->TSLCache().c_str(); break;
@@ -853,7 +848,6 @@ void Application::setConfValue( ConfParameter parameter, const QVariant &value )
 		case ProxyPort: i->setProxyPort( v.isEmpty()? std::string() : v.constData() ); break;
 		case ProxyUser: i->setProxyUser( v.isEmpty()? std::string() : v.constData() ); break;
 		case ProxyPass: i->setProxyPass( v.isEmpty()? std::string() : v.constData() ); break;
-		case ProxySSL: i->setProxyTunnelSSL( value.toBool() ); break;
 		case TSAUrl: i->setTSUrl(v.isEmpty()? std::string() : v.constData()); break;
 		case SiVaUrl: i->setVerifyServiceUri(v.isEmpty()? std::string() : v.constData()); break;
 		case TSLCerts:

diff --git a/client/Application.h b/client/Application.h
@@ -45,7 +45,6 @@ class Application final: public Common
 		ProxyPort,
 		ProxyUser,
 		ProxyPass,
-		ProxySSL,
 		TSAUrl,
 		TSLUrl,
 		TSLCerts,

diff --git a/client/Settings.cpp b/client/Settings.cpp
@@ -102,7 +102,6 @@ const Option<QString> Settings::PROXY_PORT { QStringLiteral("ProxyPort") };
 const Option<QString> Settings::PROXY_USER { QStringLiteral("ProxyUser") };
 const Option<QString> Settings::PROXY_PASS { QStringLiteral("ProxyPass") };
 #ifdef Q_OS_MAC
-const Option<bool> Settings::PROXY_TUNNEL_SSL { QStringLiteral("ProxyTunnelSSL"), false };
 const Option<QString> Settings::PLUGINS { QStringLiteral("plugins") };
 const Option<bool> Settings::TSL_ONLINE_DIGEST { QStringLiteral("TSLOnlineDigest"), true };
 #endif
diff --git a/client/Settings.h b/client/Settings.h
@@ -153,7 +153,6 @@ struct Settings
 	static const Option<QString> PROXY_USER;
 	static const Option<QString> PROXY_PASS;
 #ifdef Q_OS_MAC
-	static const Option<bool> PROXY_TUNNEL_SSL;
 	static const Option<QString> PLUGINS;
 	static const Option<bool> TSL_ONLINE_DIGEST;
 #endif

diff --git a/client/dialogs/SettingsDialog.cpp b/client/dialogs/SettingsDialog.cpp
@@ -161,7 +161,6 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
 	ui->lblProxyPort->setFont(regularFont);
 	ui->lblProxyUsername->setFont(regularFont);
 	ui->lblProxyPassword->setFont(regularFont);
-	ui->chkProxyEnableForSSL->setFont(regularFont);
 	ui->txtProxyHost->setFont(regularFont);
 	ui->txtProxyPort->setFont(regularFont);
 	ui->txtProxyUsername->setFont(regularFont);
@@ -413,7 +412,6 @@ void SettingsDialog::initFunctionality()
 	default: ui->rdProxyNone->setChecked(true); break;
 	}
 
-	ui->chkProxyEnableForSSL->setDisabled(Settings::PROXY_CONFIG != Settings::ProxyManual);
 	updateProxy();
 
 	// pageServices - TimeStamp
@@ -586,7 +584,6 @@ void SettingsDialog::setProxyEnabled()
 	ui->txtProxyPort->setEnabled(ui->rdProxyManual->isChecked());
 	ui->txtProxyUsername->setEnabled(ui->rdProxyManual->isChecked());
 	ui->txtProxyPassword->setEnabled(ui->rdProxyManual->isChecked());
-	ui->chkProxyEnableForSSL->setEnabled(ui->rdProxyManual->isChecked());
 }
 
 void SettingsDialog::updateProxy()
@@ -595,7 +592,6 @@ void SettingsDialog::updateProxy()
 	ui->txtProxyPort->setText(Application::confValue( Application::ProxyPort ).toString());
 	ui->txtProxyUsername->setText(Application::confValue( Application::ProxyUser ).toString());
 	ui->txtProxyPassword->setText(Application::confValue( Application::ProxyPass ).toString());
-	ui->chkProxyEnableForSSL->setChecked(Application::confValue( Application::ProxySSL ).toBool());
 }
 
 void SettingsDialog::updateVersion()
@@ -616,7 +612,6 @@ void SettingsDialog::saveProxy()
 	Application::setConfValue( Application::ProxyPort, ui->txtProxyPort->text() );
 	Application::setConfValue( Application::ProxyUser, ui->txtProxyUsername->text() );
 	Application::setConfValue( Application::ProxyPass, ui->txtProxyPassword->text() );
-	Application::setConfValue( Application::ProxySSL, ui->chkProxyEnableForSSL->isChecked() );
 	loadProxy(digidoc::Conf::instance());
 	updateProxy();
 }

diff --git a/client/dialogs/SettingsDialog.ui b/client/dialogs/SettingsDialog.ui
@@ -1160,13 +1160,6 @@ QPushButton {
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="2">
-        <widget class="CheckBox" name="chkProxyEnableForSSL">
-         <property name="text">
-          <string>Enable proxy for SSL connections</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="pageDiagnostics">