shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-12-22 14:16:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: add an option to disable proxy. resolves #8138 (#9660)

Browse Source
This commit is contained in:
Diego Heras
2020-09-26 22:28:29 +02:00
committed by GitHub
parent 7f02290af5
commit 41afd9f61b
7 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Jackett.Common/Utils/Clients/WebClient.cs
View File

@@ -37,45 +37,44 @@ namespace Jackett.Common.Utils.Clients
if (webProxy is SocksWebProxy proxy)
proxy.Dispose();
webProxy = null;
webProxyUrl = serverConfig.GetProxyUrl();
if (!string.IsNullOrWhiteSpace(webProxyUrl))
{
if (serverConfig.ProxyType != ProxyType.Http)
{
var addresses = Dns.GetHostAddressesAsync(serverConfig.ProxyUrl).Result;
var socksConfig = new ProxyConfig
{
SocksAddress = addresses.FirstOrDefault(),
Username = serverConfig.ProxyUsername,
Password = serverConfig.ProxyPassword,
Version = serverConfig.ProxyType == ProxyType.Socks4 ?
ProxyConfig.SocksVersion.Four :
ProxyConfig.SocksVersion.Five
};
if (serverConfig.ProxyPort.HasValue)
{
socksConfig.SocksPort = serverConfig.ProxyPort.Value;
}
webProxy = new SocksWebProxy(socksConfig, false);
}
else
{
NetworkCredential creds = null;
if (!serverConfig.ProxyIsAnonymous)
{
var username = serverConfig.ProxyUsername;
var password = serverConfig.ProxyPassword;
creds = new NetworkCredential(username, password);
}
webProxy = new WebProxy(webProxyUrl)
{
BypassProxyOnLocal = false,
Credentials = creds
};
}
}
}
webProxyUrl = serverConfig.GetProxyUrl();
if (serverConfig.ProxyType == ProxyType.Disabled || string.IsNullOrWhiteSpace(webProxyUrl))
return;
if (serverConfig.ProxyType == ProxyType.Http)
{
NetworkCredential creds = null;
if (!serverConfig.ProxyIsAnonymous)
{
var username = serverConfig.ProxyUsername;
var password = serverConfig.ProxyPassword;
creds = new NetworkCredential(username, password);
}
webProxy = new WebProxy(serverConfig.GetProxyUrl(false)) // proxy URL without credentials
{
BypassProxyOnLocal = false,
Credentials = creds
};
}
else if (serverConfig.ProxyType == ProxyType.Socks4 || serverConfig.ProxyType == ProxyType.Socks5)
{
var addresses = Dns.GetHostAddressesAsync(serverConfig.ProxyUrl).Result;
var socksConfig = new ProxyConfig
{
SocksAddress = addresses.FirstOrDefault(),
Username = serverConfig.ProxyUsername,
Password = serverConfig.ProxyPassword,
Version = serverConfig.ProxyType == ProxyType.Socks4 ?
ProxyConfig.SocksVersion.Four :
ProxyConfig.SocksVersion.Five
};
if (serverConfig.ProxyPort.HasValue)
socksConfig.SocksPort = serverConfig.ProxyPort.Value;
webProxy = new SocksWebProxy(socksConfig, false);
}
else
throw new Exception($"Proxy type '{serverConfig.ProxyType}' is not implemented!");
}
public double requestDelay
{