Allow to use proxy per subsystem

src/base/net/dnsupdater.cpp

@@ -81,7 +81,7 @@ void DNSUpdater::checkPublicIP()
 
     DownloadManager::instance()->download(
             DownloadRequest(u"http://checkip.dyndns.org"_qs).userAgent(QStringLiteral("qBittorrent/" QBT_VERSION_2))
-            , true, this, &DNSUpdater::ipRequestFinished);
+            , Preferences::instance()->useProxyForGeneralPurposes(), this, &DNSUpdater::ipRequestFinished);
 
     m_lastIPCheckTime = QDateTime::currentDateTime();
 }
@@ -129,7 +129,7 @@ void DNSUpdater::updateDNSService()
     m_lastIPCheckTime = QDateTime::currentDateTime();
     DownloadManager::instance()->download(
             DownloadRequest(getUpdateUrl()).userAgent(QStringLiteral("qBittorrent/" QBT_VERSION_2))
-            , true, this, &DNSUpdater::ipUpdateFinished);
+            , Preferences::instance()->useProxyForGeneralPurposes(), this, &DNSUpdater::ipUpdateFinished);
 }
 
 QString DNSUpdater::getUpdateUrl() const

src/base/net/downloadmanager.cpp

@@ -119,12 +119,14 @@ Net::DownloadManager *Net::DownloadManager::m_instance = nullptr;
 Net::DownloadManager::DownloadManager(QObject *parent)
     : QObject(parent)
     , m_networkCookieJar {new NetworkCookieJar(this)}
+    , m_networkManager {new QNetworkAccessManager(this)}
 {
     m_networkManager->setCookieJar(m_networkCookieJar);
     connect(m_networkManager, &QNetworkAccessManager::sslErrors, this, &Net::DownloadManager::ignoreSslErrors);
 
     connect(ProxyConfigurationManager::instance(), &ProxyConfigurationManager::proxyConfigurationChanged
             , this, &DownloadManager::applyProxySettings);
+    connect(Preferences::instance(), &Preferences::changed, this, &DownloadManager::applyProxySettings);
     applyProxySettings();
 }
 
@@ -224,10 +226,10 @@ void Net::DownloadManager::applyProxySettings()
 
     m_proxy = QNetworkProxy(QNetworkProxy::NoProxy);
 
-    if (!proxyManager->isProxyOnlyForTorrents() && (proxyConfig.type != ProxyType::None))
+    if (proxyConfig.type != ProxyType::SOCKS4)
     {
         // Proxy enabled
-        if ((proxyConfig.type == ProxyType::SOCKS5) || (proxyConfig.type == ProxyType::SOCKS5_PW))
+        if (proxyConfig.type == ProxyType::SOCKS5)
         {
             qDebug() << Q_FUNC_INFO << "using SOCKS proxy";
             m_proxy.setType(QNetworkProxy::Socks5Proxy);
@@ -242,7 +244,7 @@ void Net::DownloadManager::applyProxySettings()
         m_proxy.setPort(proxyConfig.port);
 
         // Authentication?
-        if (proxyManager->isAuthenticationRequired())
+        if (proxyConfig.authEnabled)
         {
             qDebug("Proxy requires authentication, authenticating...");
             m_proxy.setUser(proxyConfig.username);

src/base/net/geoipmanager.cpp

@@ -129,7 +129,9 @@ void GeoIPManager::downloadDatabaseFile()
 {
     const QDateTime curDatetime = QDateTime::currentDateTimeUtc();
     const QString curUrl = DATABASE_URL.arg(QLocale::c().toString(curDatetime, u"yyyy-MM"));
-    DownloadManager::instance()->download({curUrl}, true, this, &GeoIPManager::downloadFinished);
+    DownloadManager::instance()->download(
+            {curUrl}, Preferences::instance()->useProxyForGeneralPurposes()
+            , this, &GeoIPManager::downloadFinished);
 }
 
 QString GeoIPManager::lookup(const QHostAddress &hostAddr) const

src/base/net/proxyconfigurationmanager.cpp

@@ -35,6 +35,7 @@ bool Net::operator==(const ProxyConfiguration &left, const ProxyConfiguration &r
     return (left.type == right.type)
             && (left.ip == right.ip)
             && (left.port == right.port)
+            && (left.authEnabled == right.authEnabled)
             && (left.username == right.username)
             && (left.password == right.password);
 }
@@ -49,19 +50,20 @@ using namespace Net;
 ProxyConfigurationManager *ProxyConfigurationManager::m_instance = nullptr;
 
 ProxyConfigurationManager::ProxyConfigurationManager(QObject *parent)
-    : QObject {parent}
-    , m_storeProxyOnlyForTorrents {SETTINGS_KEY(u"OnlyForTorrents"_qs)}
+    : QObject(parent)
     , m_storeProxyType {SETTINGS_KEY(u"Type"_qs)}
     , m_storeProxyIP {SETTINGS_KEY(u"IP"_qs)}
     , m_storeProxyPort {SETTINGS_KEY(u"Port"_qs)}
+    , m_storeProxyAuthEnabled {SETTINGS_KEY(u"AuthEnabled"_qs)}
     , m_storeProxyUsername {SETTINGS_KEY(u"Username"_qs)}
     , m_storeProxyPassword {SETTINGS_KEY(u"Password"_qs)}
 {
-    m_config.type = m_storeProxyType.get(ProxyType::None);
-    if ((m_config.type < ProxyType::None) || (m_config.type > ProxyType::SOCKS4))
-        m_config.type = ProxyType::None;
+    m_config.type = m_storeProxyType.get(ProxyType::HTTP);
+    if ((m_config.type < ProxyType::HTTP) || (m_config.type > ProxyType::SOCKS4))
+        m_config.type = ProxyType::HTTP;
     m_config.ip = m_storeProxyIP.get(u"0.0.0.0"_qs);
     m_config.port = m_storeProxyPort.get(8080);
+    m_config.authEnabled = m_storeProxyAuthEnabled;
     m_config.username = m_storeProxyUsername;
     m_config.password = m_storeProxyPassword;
 }
@@ -96,25 +98,10 @@ void ProxyConfigurationManager::setProxyConfiguration(const ProxyConfiguration &
         m_storeProxyType = config.type;
         m_storeProxyIP = config.ip;
         m_storeProxyPort = config.port;
+        m_storeProxyAuthEnabled = config.authEnabled;
         m_storeProxyUsername = config.username;
         m_storeProxyPassword = config.password;
 
         emit proxyConfigurationChanged();
     }
 }
-
-bool ProxyConfigurationManager::isProxyOnlyForTorrents() const
-{
-    return m_storeProxyOnlyForTorrents || (m_config.type == ProxyType::SOCKS4);
-}
-
-void ProxyConfigurationManager::setProxyOnlyForTorrents(const bool onlyForTorrents)
-{
-    m_storeProxyOnlyForTorrents = onlyForTorrents;
-}
-
-bool ProxyConfigurationManager::isAuthenticationRequired() const
-{
-    return m_config.type == ProxyType::SOCKS5_PW
-            || m_config.type == ProxyType::HTTP_PW;
-}

src/base/net/proxyconfigurationmanager.h

@@ -39,20 +39,18 @@ namespace Net
 
     enum class ProxyType
     {
-        None = 0,
         HTTP = 1,
         SOCKS5 = 2,
-        HTTP_PW = 3,
-        SOCKS5_PW = 4,
         SOCKS4 = 5
     };
     Q_ENUM_NS(ProxyType)
 
     struct ProxyConfiguration
     {
-        ProxyType type = ProxyType::None;
+        ProxyType type = ProxyType::HTTP;
         QString ip = u"0.0.0.0"_qs;
         ushort port = 8080;
+        bool authEnabled = false;
         QString username;
         QString password;
     };
@@ -74,10 +72,6 @@ namespace Net
 
         ProxyConfiguration proxyConfiguration() const;
         void setProxyConfiguration(const ProxyConfiguration &config);
-        bool isProxyOnlyForTorrents() const;
-        void setProxyOnlyForTorrents(bool onlyForTorrents);
-
-        bool isAuthenticationRequired() const;
 
     signals:
         void proxyConfigurationChanged();
@@ -85,10 +79,10 @@ namespace Net
     private:
         static ProxyConfigurationManager *m_instance;
         ProxyConfiguration m_config;
-        SettingValue<bool> m_storeProxyOnlyForTorrents;
         SettingValue<ProxyType> m_storeProxyType;
         SettingValue<QString> m_storeProxyIP;
         SettingValue<ushort> m_storeProxyPort;
+        SettingValue<bool> m_storeProxyAuthEnabled;
         SettingValue<QString> m_storeProxyUsername;
         SettingValue<QString> m_storeProxyPassword;
     };