From efe4239f96f0cf10b1c94e87f8fdd21f3bdbe10e Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 15 Mar 2020 20:26:53 +0100 Subject: [PATCH 1/1] ssl: Remove legacy useSsl account setting The UI for disabling client-side SSL support has been removed a long time ago, but the setting still existed in CoreAccount and related classes. Since SSL is now always support in the client, remove the remnants of the legacy setting. Note that cores still must be able to cope with legacy clients that have SSL disabled. --- src/client/clientauthhandler.cpp | 15 +++++---------- src/client/coreaccount.cpp | 9 --------- src/client/coreaccount.h | 4 +--- src/common/protocols/legacy/legacypeer.cpp | 2 +- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/client/clientauthhandler.cpp b/src/client/clientauthhandler.cpp index 469299fd..260128b7 100644 --- a/src/client/clientauthhandler.cpp +++ b/src/client/clientauthhandler.cpp @@ -159,8 +159,7 @@ void ClientAuthHandler::onSocketConnected() stream.setVersion(QDataStream::Qt_4_2); quint32 magic = Protocol::magic; - if (_account.useSsl()) - magic |= Protocol::Encryption; + magic |= Protocol::Encryption; magic |= Protocol::Compression; stream << magic; @@ -253,7 +252,7 @@ void ClientAuthHandler::setPeer(RemotePeer* peer) connect(_peer, &RemotePeer::transferProgress, this, &ClientAuthHandler::transferProgress); // The legacy protocol enables SSL later, after registration - if (!_account.useSsl() || _legacy) + if (_legacy) startRegistration(); // otherwise, do it now else @@ -264,11 +263,7 @@ void ClientAuthHandler::startRegistration() { emit statusMessage(tr("Synchronizing to core...")); - // useSsl will be ignored by non-legacy peers - bool useSsl = false; - useSsl = _account.useSsl(); - - _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl)); + _peer->dispatch(Protocol::RegisterClient(Quassel::Features{}, Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate)); } void ClientAuthHandler::handle(const Protocol::ClientDenied& msg) @@ -286,7 +281,7 @@ void ClientAuthHandler::handle(const Protocol::ClientRegistered& msg) _peer->setFeatures(std::move(msg.features)); // The legacy protocol enables SSL at this point - if (_legacy && _account.useSsl()) + if (_legacy) checkAndEnableSsl(msg.sslSupported); else onConnectionReady(); @@ -380,7 +375,7 @@ void ClientAuthHandler::handle(const Protocol::SessionState& msg) void ClientAuthHandler::checkAndEnableSsl(bool coreSupportsSsl) { CoreAccountSettings s; - if (coreSupportsSsl && _account.useSsl()) { + if (coreSupportsSsl) { // Make sure the warning is shown next time we don't have SSL in the core s.setAccountValue("ShowNoCoreSslWarning", true); diff --git a/src/client/coreaccount.cpp b/src/client/coreaccount.cpp index 7015b1de..e599a513 100644 --- a/src/client/coreaccount.cpp +++ b/src/client/coreaccount.cpp @@ -26,7 +26,6 @@ CoreAccount::CoreAccount(AccountId accountId) _internal = false; _port = 4242; _storePassword = false; - _useSsl = true; _proxyType = QNetworkProxy::DefaultProxy; _proxyPort = 8080; } @@ -76,11 +75,6 @@ void CoreAccount::setPort(uint port) _port = port; } -void CoreAccount::setUseSsl(bool useSsl) -{ - _useSsl = useSsl; -} - void CoreAccount::setProxyType(QNetworkProxy::ProxyType type) { _proxyType = type; @@ -121,7 +115,6 @@ QVariantMap CoreAccount::toVariantMap(bool forcePassword) const v["StorePassword"] = storePassword(); v["HostName"] = hostName(); v["Port"] = port(); - v["UseSSL"] = useSsl(); v["ProxyType"] = proxyType(); v["ProxyUser"] = proxyUser(); v["ProxyPassword"] = proxyPassword(); @@ -141,7 +134,6 @@ void CoreAccount::fromVariantMap(const QVariantMap& v) setStorePassword(v.value("StorePassword").toBool()); setHostName(v.value("HostName").toString()); setPort(v.value("Port").toUInt()); - setUseSsl(v.value("UseSSL").toBool()); setProxyType((QNetworkProxy::ProxyType)v.value("ProxyType").toInt()); setProxyUser(v.value("ProxyUser").toString()); setProxyPassword(v.value("ProxyPassword").toString()); @@ -172,7 +164,6 @@ QDebug operator<<(QDebug dbg, const CoreAccount& acc) << qPrintable(QString(", StorePassword:")) << acc.storePassword() << qPrintable(QString(", HostName:")) << acc.hostName() << qPrintable(QString(", Port:")) << acc.port() - << qPrintable(QString(", UseSSL:")) << acc.useSsl() << qPrintable(QString(", ProxyType:")) << acc.proxyType() << qPrintable(QString(", ProxyUser:")) << acc.proxyUser() << qPrintable(QString(", ProxyPassword:")) << acc.proxyPassword() diff --git a/src/client/coreaccount.h b/src/client/coreaccount.h index 46a67e32..4caa28a3 100644 --- a/src/client/coreaccount.h +++ b/src/client/coreaccount.h @@ -48,7 +48,6 @@ public: inline bool storePassword() const { return _storePassword; } inline QString hostName() const { return _hostName; } inline uint port() const { return _port; } - inline bool useSsl() const { return _useSsl; } inline QNetworkProxy::ProxyType proxyType() const { return _proxyType; } inline QString proxyUser() const { return _proxyUser; } @@ -64,7 +63,6 @@ public: void setStorePassword(bool); void setHostName(const QString& hostname); void setPort(uint port); - void setUseSsl(bool); void setProxyType(QNetworkProxy::ProxyType); void setProxyUser(const QString&); @@ -90,7 +88,7 @@ private: bool _internal; QString _user, _password, _hostName; uint _port; - bool _storePassword, _useSsl; + bool _storePassword{}; QNetworkProxy::ProxyType _proxyType; QString _proxyUser, _proxyPassword, _proxyHostName; uint _proxyPort; diff --git a/src/common/protocols/legacy/legacypeer.cpp b/src/common/protocols/legacy/legacypeer.cpp index 9b1c56f4..0ec819e9 100644 --- a/src/common/protocols/legacy/legacypeer.cpp +++ b/src/common/protocols/legacy/legacypeer.cpp @@ -237,7 +237,7 @@ void LegacyPeer::dispatch(const RegisterClient& msg) // FIXME only in compat mode m["ProtocolVersion"] = protocolVersion; - m["UseSsl"] = msg.sslSupported; + m["UseSsl"] = true; #ifndef QT_NO_COMPRESS m["UseCompression"] = true; #else -- 2.20.1