mirror of
https://github.com/Jackett/Jackett.git
synced 2025-09-17 17:34:09 +02:00
HttpWebClient: Attempt to fix "Too many open files" in unix environments
This commit is contained in:
kaso17
@@ -27,7 +27,7 @@ namespace Jackett.Utils.Clients
|
|||||||
{
|
{
|
||||||
if (Startup.IgnoreSslErrors == true)
|
if (Startup.IgnoreSslErrors == true)
|
||||||
{
|
{
|
||||||
logger.Info(string.Format("WindowsWebClient: Disabling certificate validation"));
|
logger.Info(string.Format("HttpWebClient: Disabling certificate validation"));
|
||||||
ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => { return true; };
|
ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => { return true; };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -60,139 +60,147 @@ namespace Jackett.Utils.Clients
|
|||||||
useProxy = true;
|
useProxy = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ClearanceHandler clearanceHandlr = new ClearanceHandler();
|
using (ClearanceHandler clearanceHandlr = new ClearanceHandler())
|
||||||
HttpClientHandler clientHandlr = new HttpClientHandler
|
|
||||||
{
|
{
|
||||||
CookieContainer = cookies,
|
using (HttpClientHandler clientHandlr = new HttpClientHandler
|
||||||
AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
|
|
||||||
UseCookies = true,
|
|
||||||
Proxy = proxyServer,
|
|
||||||
UseProxy = useProxy,
|
|
||||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
|
|
||||||
};
|
|
||||||
|
|
||||||
clearanceHandlr.InnerHandler = clientHandlr;
|
|
||||||
var client = new HttpClient(clearanceHandlr);
|
|
||||||
|
|
||||||
if (webRequest.EmulateBrowser)
|
|
||||||
client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
|
|
||||||
else
|
|
||||||
client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
|
|
||||||
|
|
||||||
HttpResponseMessage response = null;
|
|
||||||
var request = new HttpRequestMessage();
|
|
||||||
request.Headers.ExpectContinue = false;
|
|
||||||
request.RequestUri = new Uri(webRequest.Url);
|
|
||||||
|
|
||||||
if (webRequest.Headers != null)
|
|
||||||
{
|
|
||||||
foreach (var header in webRequest.Headers)
|
|
||||||
{
|
{
|
||||||
if (header.Key != "Content-Type")
|
CookieContainer = cookies,
|
||||||
|
AllowAutoRedirect = false, // Do not use this - Bugs ahoy! Lost cookies and more.
|
||||||
|
UseCookies = true,
|
||||||
|
Proxy = proxyServer,
|
||||||
|
UseProxy = useProxy,
|
||||||
|
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
|
||||||
|
})
|
||||||
|
{
|
||||||
|
|
||||||
|
clearanceHandlr.InnerHandler = clientHandlr;
|
||||||
|
using (var client = new HttpClient(clearanceHandlr))
|
||||||
{
|
{
|
||||||
request.Headers.TryAddWithoutValidation(header.Key, header.Value);
|
if (webRequest.EmulateBrowser)
|
||||||
}
|
client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
|
||||||
}
|
else
|
||||||
}
|
client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(webRequest.Referer))
|
HttpResponseMessage response = null;
|
||||||
request.Headers.Referrer = new Uri(webRequest.Referer);
|
using (var request = new HttpRequestMessage())
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(webRequest.RawBody))
|
|
||||||
{
|
|
||||||
var type = webRequest.Headers.Where(h => h.Key == "Content-Type").Cast<KeyValuePair<string,string>?>().FirstOrDefault();
|
|
||||||
if (type.HasValue)
|
|
||||||
{
|
|
||||||
var str = new StringContent(webRequest.RawBody);
|
|
||||||
str.Headers.Remove("Content-Type");
|
|
||||||
str.Headers.Add("Content-Type", type.Value.Value);
|
|
||||||
request.Content = str;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
request.Content = new StringContent(webRequest.RawBody);
|
|
||||||
request.Method = HttpMethod.Post;
|
|
||||||
}
|
|
||||||
else if (webRequest.Type == RequestType.POST)
|
|
||||||
{
|
|
||||||
request.Content = new FormUrlEncodedContent(webRequest.PostData);
|
|
||||||
request.Method = HttpMethod.Post;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
request.Method = HttpMethod.Get;
|
|
||||||
}
|
|
||||||
|
|
||||||
response = await client.SendAsync(request);
|
|
||||||
|
|
||||||
var result = new WebClientByteResult();
|
|
||||||
result.Content = await response.Content.ReadAsByteArrayAsync();
|
|
||||||
|
|
||||||
foreach (var header in response.Headers)
|
|
||||||
{
|
|
||||||
IEnumerable<string> value = header.Value;
|
|
||||||
result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
// some cloudflare clients are using a refresh header
|
|
||||||
// Pull it out manually
|
|
||||||
if (response.StatusCode == System.Net.HttpStatusCode.ServiceUnavailable && response.Headers.Contains("Refresh"))
|
|
||||||
{
|
|
||||||
var refreshHeaders = response.Headers.GetValues("Refresh");
|
|
||||||
var redirval = "";
|
|
||||||
var redirtime = 0;
|
|
||||||
if (refreshHeaders != null)
|
|
||||||
{
|
|
||||||
foreach (var value in refreshHeaders)
|
|
||||||
{
|
|
||||||
var start = value.IndexOf("=");
|
|
||||||
var end = value.IndexOf(";");
|
|
||||||
var len = value.Length;
|
|
||||||
if (start > -1)
|
|
||||||
{
|
{
|
||||||
redirval = value.Substring(start + 1);
|
request.Headers.ExpectContinue = false;
|
||||||
result.RedirectingTo = redirval;
|
request.RequestUri = new Uri(webRequest.Url);
|
||||||
// normally we don't want a serviceunavailable (503) to be a redirect, but that's the nature
|
|
||||||
// of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
|
if (webRequest.Headers != null)
|
||||||
// it shoudln't include service unavailable..only if we have this redirect header.
|
{
|
||||||
response.StatusCode = System.Net.HttpStatusCode.Redirect;
|
foreach (var header in webRequest.Headers)
|
||||||
redirtime = Int32.Parse(value.Substring(0, end));
|
{
|
||||||
System.Threading.Thread.Sleep(redirtime * 1000);
|
if (header.Key != "Content-Type")
|
||||||
|
{
|
||||||
|
request.Headers.TryAddWithoutValidation(header.Key, header.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(webRequest.Referer))
|
||||||
|
request.Headers.Referrer = new Uri(webRequest.Referer);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(webRequest.RawBody))
|
||||||
|
{
|
||||||
|
var type = webRequest.Headers.Where(h => h.Key == "Content-Type").Cast<KeyValuePair<string, string>?>().FirstOrDefault();
|
||||||
|
if (type.HasValue)
|
||||||
|
{
|
||||||
|
var str = new StringContent(webRequest.RawBody);
|
||||||
|
str.Headers.Remove("Content-Type");
|
||||||
|
str.Headers.Add("Content-Type", type.Value.Value);
|
||||||
|
request.Content = str;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
request.Content = new StringContent(webRequest.RawBody);
|
||||||
|
request.Method = HttpMethod.Post;
|
||||||
|
}
|
||||||
|
else if (webRequest.Type == RequestType.POST)
|
||||||
|
{
|
||||||
|
request.Content = new FormUrlEncodedContent(webRequest.PostData);
|
||||||
|
request.Method = HttpMethod.Post;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
request.Method = HttpMethod.Get;
|
||||||
|
}
|
||||||
|
|
||||||
|
using (response = await client.SendAsync(request))
|
||||||
|
{
|
||||||
|
var result = new WebClientByteResult();
|
||||||
|
result.Content = await response.Content.ReadAsByteArrayAsync();
|
||||||
|
|
||||||
|
foreach (var header in response.Headers)
|
||||||
|
{
|
||||||
|
IEnumerable<string> value = header.Value;
|
||||||
|
result.Headers[header.Key.ToLowerInvariant()] = value.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
// some cloudflare clients are using a refresh header
|
||||||
|
// Pull it out manually
|
||||||
|
if (response.StatusCode == System.Net.HttpStatusCode.ServiceUnavailable && response.Headers.Contains("Refresh"))
|
||||||
|
{
|
||||||
|
var refreshHeaders = response.Headers.GetValues("Refresh");
|
||||||
|
var redirval = "";
|
||||||
|
var redirtime = 0;
|
||||||
|
if (refreshHeaders != null)
|
||||||
|
{
|
||||||
|
foreach (var value in refreshHeaders)
|
||||||
|
{
|
||||||
|
var start = value.IndexOf("=");
|
||||||
|
var end = value.IndexOf(";");
|
||||||
|
var len = value.Length;
|
||||||
|
if (start > -1)
|
||||||
|
{
|
||||||
|
redirval = value.Substring(start + 1);
|
||||||
|
result.RedirectingTo = redirval;
|
||||||
|
// normally we don't want a serviceunavailable (503) to be a redirect, but that's the nature
|
||||||
|
// of this cloudflare approach..don't want to alter BaseWebResult.IsRedirect because normally
|
||||||
|
// it shoudln't include service unavailable..only if we have this redirect header.
|
||||||
|
response.StatusCode = System.Net.HttpStatusCode.Redirect;
|
||||||
|
redirtime = Int32.Parse(value.Substring(0, end));
|
||||||
|
System.Threading.Thread.Sleep(redirtime * 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (response.Headers.Location != null)
|
||||||
|
{
|
||||||
|
result.RedirectingTo = response.Headers.Location.ToString();
|
||||||
|
}
|
||||||
|
result.Status = response.StatusCode;
|
||||||
|
|
||||||
|
// Compatiblity issue between the cookie format and httpclient
|
||||||
|
// Pull it out manually ignoring the expiry date then set it manually
|
||||||
|
// http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
|
||||||
|
IEnumerable<string> cookieHeaders;
|
||||||
|
var responseCookies = new List<Tuple<string, string>>();
|
||||||
|
|
||||||
|
if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
|
||||||
|
{
|
||||||
|
foreach (var value in cookieHeaders)
|
||||||
|
{
|
||||||
|
var nameSplit = value.IndexOf('=');
|
||||||
|
if (nameSplit > -1)
|
||||||
|
{
|
||||||
|
responseCookies.Add(new Tuple<string, string>(value.Substring(0, nameSplit), value.Substring(0, value.IndexOf(';') == -1 ? value.Length : (value.IndexOf(';') + 1))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var cookieBuilder = new StringBuilder();
|
||||||
|
foreach (var cookieGroup in responseCookies.GroupBy(c => c.Item1))
|
||||||
|
{
|
||||||
|
cookieBuilder.AppendFormat("{0} ", cookieGroup.Last().Item2);
|
||||||
|
}
|
||||||
|
result.Cookies = cookieBuilder.ToString().Trim();
|
||||||
|
}
|
||||||
|
ServerUtil.ResureRedirectIsFullyQualified(webRequest, result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (response.Headers.Location != null)
|
|
||||||
{
|
|
||||||
result.RedirectingTo = response.Headers.Location.ToString();
|
|
||||||
}
|
|
||||||
result.Status = response.StatusCode;
|
|
||||||
|
|
||||||
// Compatiblity issue between the cookie format and httpclient
|
|
||||||
// Pull it out manually ignoring the expiry date then set it manually
|
|
||||||
// http://stackoverflow.com/questions/14681144/httpclient-not-storing-cookies-in-cookiecontainer
|
|
||||||
IEnumerable<string> cookieHeaders;
|
|
||||||
var responseCookies = new List<Tuple<string, string>>();
|
|
||||||
|
|
||||||
if (response.Headers.TryGetValues("set-cookie", out cookieHeaders))
|
|
||||||
{
|
|
||||||
foreach (var value in cookieHeaders)
|
|
||||||
{
|
|
||||||
var nameSplit = value.IndexOf('=');
|
|
||||||
if (nameSplit > -1)
|
|
||||||
{
|
|
||||||
responseCookies.Add(new Tuple<string, string>(value.Substring(0, nameSplit), value.Substring(0, value.IndexOf(';') == -1 ? value.Length : (value.IndexOf(';') + 1))));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var cookieBuilder = new StringBuilder();
|
|
||||||
foreach (var cookieGroup in responseCookies.GroupBy(c => c.Item1))
|
|
||||||
{
|
|
||||||
cookieBuilder.AppendFormat("{0} ", cookieGroup.Last().Item2);
|
|
||||||
}
|
|
||||||
result.Cookies = cookieBuilder.ToString().Trim();
|
|
||||||
}
|
|
||||||
ServerUtil.ResureRedirectIsFullyQualified(webRequest, result);
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user