squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-04 14:42:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add SOCKS4/SOCKS4a proxy support to search engine

Browse Source 
Pass 'Perform hostname lookup via proxy' setting along the way.
Also add underline to variables and functions that are private to the python module.

PR #22510.
This commit is contained in:
Chocobo1
2025-04-13 16:25:38 +08:00
committed by GitHub
parent abafbc0685
commit 3d73026ff2
2 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/base/search/searchpluginmanager.cpp
View File

@@ -409,11 +409,11 @@ Path SearchPluginManager::engineLocation()
void SearchPluginManager::applyProxySettings()
{
// Define environment variables for urllib in search engine plugins
// for python `urllib`: https://docs.python.org/3/library/urllib.request.html#urllib.request.ProxyHandler
const QString HTTP_PROXY = u"http_proxy"_s;
const QString HTTPS_PROXY = u"https_proxy"_s;
const QString SOCKS_PROXY = u"sock_proxy"_s;
// for `helpers.setupSOCKSProxy()`: https://everything.curl.dev/usingcurl/proxies/socks.html
const QString SOCKS_PROXY = u"qbt_socks_proxy"_s;
if (!Preferences::instance()->useProxyForGeneralPurposes())
{
@@ -427,7 +427,6 @@ void SearchPluginManager::applyProxySettings()
switch (proxyConfig.type)
{
case Net::ProxyType::None:
case Net::ProxyType::SOCKS4: // TODO: implement python code
m_proxyEnv.remove(HTTP_PROXY);
m_proxyEnv.remove(HTTPS_PROXY);
m_proxyEnv.remove(SOCKS_PROXY);
@@ -435,9 +434,12 @@ void SearchPluginManager::applyProxySettings()
case Net::ProxyType::HTTP:
{
const QString proxyURL = proxyConfig.authEnabled
? u"http://%1:%2@%3:%4"_s.arg(proxyConfig.username, proxyConfig.password, proxyConfig.ip, QString::number(proxyConfig.port))
: u"http://%1:%2"_s.arg(proxyConfig.ip, QString::number(proxyConfig.port));
const QString credential = proxyConfig.authEnabled
? (proxyConfig.username + u':' + proxyConfig.password + u'@')
: QString();
const QString proxyURL = u"http://%1%2:%3"_s
.arg(credential, proxyConfig.ip, QString::number(proxyConfig.port));
m_proxyEnv.insert(HTTP_PROXY, proxyURL);
m_proxyEnv.insert(HTTPS_PROXY, proxyURL);
m_proxyEnv.remove(SOCKS_PROXY);
@@ -446,9 +448,25 @@ void SearchPluginManager::applyProxySettings()
case Net::ProxyType::SOCKS5:
{
const QString proxyURL = proxyConfig.authEnabled
? u"%1:%2@%3:%4"_s.arg(proxyConfig.username, proxyConfig.password, proxyConfig.ip, QString::number(proxyConfig.port))
: u"%1:%2"_s.arg(proxyConfig.ip, QString::number(proxyConfig.port));
const QString scheme = proxyConfig.hostnameLookupEnabled ? u"socks5h"_s : u"socks5"_s;
const QString credential = proxyConfig.authEnabled
? (proxyConfig.username + u':' + proxyConfig.password + u'@')
: QString();
const QString proxyURL = u"%1://%2%3:%4"_s
.arg(scheme, credential, proxyConfig.ip, QString::number(proxyConfig.port));
m_proxyEnv.remove(HTTP_PROXY);
m_proxyEnv.remove(HTTPS_PROXY);
m_proxyEnv.insert(SOCKS_PROXY, proxyURL);
}
break;
case Net::ProxyType::SOCKS4:
{
const QString scheme = proxyConfig.hostnameLookupEnabled ? u"socks4a"_s : u"socks4"_s;
const QString proxyURL = u"%1://%2:%3"_s
.arg(scheme, proxyConfig.ip, QString::number(proxyConfig.port));
m_proxyEnv.remove(HTTP_PROXY);
m_proxyEnv.remove(HTTPS_PROXY);
m_proxyEnv.insert(SOCKS_PROXY, proxyURL);