Backup_Repos/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr synced 2026-01-20 06:32:04 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Indexer proxies not applying to requests

Browse source 
Fixes #1107
This commit is contained in:
Qstick 2022-09-05 19:55:46 -05:00
parent bf2e057247
commit f97b35403d
5 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
View file

@ -99,7 +99,7 @@ public async Task<HttpResponse> GetResponseAsync(HttpRequest request, CookieCont
AddRequestHeaders(requestMessage, request.Headers);
}
var httpClient = GetClient(request.Url);
var httpClient = GetClient(request.Url, request.ProxySettings);
var sw = new Stopwatch();
@ -154,9 +154,9 @@ public async Task<HttpResponse> GetResponseAsync(HttpRequest request, CookieCont
}
}
protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)
protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri, HttpProxySettings requestProxy)
{
var proxySettings = _proxySettingsProvider.GetProxySettings(uri);
var proxySettings = requestProxy ?? _proxySettingsProvider.GetProxySettings(uri);
var key = proxySettings?.Key ?? NO_PROXY_KEY;

3
src/NzbDrone.Common/Http/HttpRequest.cs
View file

@ -6,6 +6,7 @@
using System.Text;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http.Proxy;
namespace NzbDrone.Common.Http
{
@ -37,7 +38,7 @@ public HttpRequest(string url, HttpAccept httpAccept = null)
public HttpMethod Method { get; set; }
public HttpHeader Headers { get; set; }
public Encoding Encoding { get; set; }
public IWebProxy Proxy { get; set; }
public HttpProxySettings ProxySettings { get; set; }
public byte[] ContentData { get; set; }
public string ContentSummary { get; set; }
public ICredentials Credentials { get; set; }

17
src/NzbDrone.Core/IndexerProxies/Http/Http.cs
View file

@ -3,7 +3,9 @@
using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Common.Http.Proxy;
using NzbDrone.Core.Localization;
using NzbDrone.Core.Notifications.Prowl;
namespace NzbDrone.Core.IndexerProxies.Http
{
@ -18,14 +20,13 @@ public Http(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpCl
public override HttpRequest PreRequest(HttpRequest request)
{
if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
{
request.Proxy = new WebProxy(Settings.Host + ":" + Settings.Port, false, null, new NetworkCredential(Settings.Username, Settings.Password));
}
else
{
request.Proxy = new WebProxy(Settings.Host + ":" + Settings.Port, false, null);
}
request.ProxySettings = new HttpProxySettings(ProxyType.Http,
Settings.Host,
Settings.Port,
null,
false,
Settings.Username,
Settings.Password);
_logger.Debug("Applying HTTP(S) Proxy {0} to request {1}", Name, request.Url);

16
src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs
View file

@ -4,6 +4,7 @@
using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Common.Http.Proxy;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.IndexerProxies.Socks4
@ -25,14 +26,13 @@ public override HttpRequest PreRequest(HttpRequest request)
return null;
}
if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
{
request.Proxy = new WebProxy(uri, false, null, new NetworkCredential(Settings.Username, Settings.Password));
}
else
{
request.Proxy = new WebProxy(uri);
}
request.ProxySettings = new HttpProxySettings(ProxyType.Socks4,
Settings.Host,
Settings.Port,
null,
false,
Settings.Username,
Settings.Password);
_logger.Debug("Applying Socks4 Proxy {0} to request {1}", Name, request.Url);

16
src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs
View file

@ -4,6 +4,7 @@
using NzbDrone.Common.Cloud;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Common.Http.Proxy;
using NzbDrone.Core.Localization;
namespace NzbDrone.Core.IndexerProxies.Socks5
@ -26,14 +27,13 @@ public override HttpRequest PreRequest(HttpRequest request)
return null;
}
if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
{
request.Proxy = new WebProxy(uri, false, null, new NetworkCredential(Settings.Username, Settings.Password));
}
else
{
request.Proxy = new WebProxy(uri);
}
request.ProxySettings = new HttpProxySettings(ProxyType.Socks5,
Settings.Host,
Settings.Port,
null,
false,
Settings.Username,
Settings.Password);
_logger.Debug("Applying Socks5 Proxy {0} to request {1}", Name, request.Url);