shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4982: replaced CloudFlareUtilities with CloudflareSolverRe (#5897)

Browse Source
This commit is contained in:
Hazem Ahmed Amr
2019-08-22 21:35:49 +02:00
committed by garfield69
parent d343046e61
commit 90c224fdea
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Jackett.Common/Jackett.Common.csproj
View File

@@ -11,7 +11,7 @@
<PackageReference Include="Autofac" Version="4.9.2" /> <PackageReference Include="Autofac" Version="4.9.2" />
<PackageReference Include="AutoMapper" Version="8.1.0" /> <PackageReference Include="AutoMapper" Version="8.1.0" />
<PackageReference Include="BencodeNET" Version="2.3.0" /> <PackageReference Include="BencodeNET" Version="2.3.0" />
<PackageReference Include="CloudFlareUtilities" Version="1.3.0" /> <PackageReference Include="CloudflareSolverRe" Version="1.0.5" />
<PackageReference Include="CommandLineParser" Version="2.5.0" /> <PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" /> <PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" /> <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />

8
src/Jackett.Common/Utils/Clients/HttpWebClient.cs
View File

@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using com.LandonKey.SocksWebProxy; using com.LandonKey.SocksWebProxy;
using com.LandonKey.SocksWebProxy.Proxy; using com.LandonKey.SocksWebProxy.Proxy;
using CloudFlareUtilities; using CloudflareSolverRe;
using Jackett.Common.Models.Config; using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using NLog; using NLog;
@@ -154,9 +154,11 @@ namespace Jackett.Common.Utils.Clients
} }
} }
using (ClearanceHandler clearanceHandlr = new ClearanceHandler()) string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
{ {
clearanceHandlr.MaxRetries = 30; clearanceHandlr.MaxTries = 30;
using (HttpClientHandler clientHandlr = new HttpClientHandler using (HttpClientHandler clientHandlr = new HttpClientHandler
{ {
CookieContainer = cookies, CookieContainer = cookies,

6
src/Jackett.Common/Utils/Clients/HttpWebClient2.cs
View File

@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using com.LandonKey.SocksWebProxy; using com.LandonKey.SocksWebProxy;
using com.LandonKey.SocksWebProxy.Proxy; using com.LandonKey.SocksWebProxy.Proxy;
using CloudFlareUtilities; using CloudflareSolverRe;
using Jackett.Common.Models.Config; using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using NLog; using NLog;
@@ -122,8 +122,8 @@ namespace Jackett.Common.Utils.Clients
public void CreateClient() public void CreateClient()
{ {
clearanceHandlr = new ClearanceHandler(); clearanceHandlr = new ClearanceHandler(BrowserUtil.ChromeUserAgent);
clearanceHandlr.MaxRetries = 30; clearanceHandlr.MaxTries = 30;
clientHandlr = new HttpClientHandler clientHandlr = new HttpClientHandler
{ {
CookieContainer = cookies, CookieContainer = cookies,

14
src/Jackett.Common/Utils/Clients/HttpWebClient2NetCore.cs
View File

@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using com.LandonKey.SocksWebProxy; using com.LandonKey.SocksWebProxy;
using com.LandonKey.SocksWebProxy.Proxy; using com.LandonKey.SocksWebProxy.Proxy;
using CloudFlareUtilities; using CloudflareSolverRe;
using Jackett.Common.Models.Config; using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using NLog; using NLog;
@@ -118,8 +118,8 @@ namespace Jackett.Common.Utils.Clients
public void CreateClient() public void CreateClient()
{ {
clearanceHandlr = new ClearanceHandler(); clearanceHandlr = new ClearanceHandler(BrowserUtil.ChromeUserAgent);
clearanceHandlr.MaxRetries = 30; clearanceHandlr.MaxTries = 30;
clientHandlr = new HttpClientHandler clientHandlr = new HttpClientHandler
{ {
CookieContainer = cookies, CookieContainer = cookies,
@@ -169,10 +169,10 @@ namespace Jackett.Common.Utils.Clients
request.Headers.ExpectContinue = false; request.Headers.ExpectContinue = false;
request.RequestUri = new Uri(webRequest.Url); request.RequestUri = new Uri(webRequest.Url);
if (webRequest.EmulateBrowser == true) //if (webRequest.EmulateBrowser == true)
request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent); // request.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
else //else
request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion()); // request.Headers.UserAgent.ParseAdd("Jackett/" + configService.GetVersion());
// clear cookies from cookiecontainer // clear cookies from cookiecontainer
var oldCookies = cookies.GetCookies(request.RequestUri); var oldCookies = cookies.GetCookies(request.RequestUri);

16
src/Jackett.Common/Utils/Clients/HttpWebClientNetCore.cs
View File

@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using com.LandonKey.SocksWebProxy; using com.LandonKey.SocksWebProxy;
using com.LandonKey.SocksWebProxy.Proxy; using com.LandonKey.SocksWebProxy.Proxy;
using CloudFlareUtilities; using CloudflareSolverRe;
using Jackett.Common.Models.Config; using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using NLog; using NLog;
@@ -150,9 +150,11 @@ namespace Jackett.Common.Utils.Clients
} }
} }
using (ClearanceHandler clearanceHandlr = new ClearanceHandler()) string userAgent = webRequest.EmulateBrowser.Value ? BrowserUtil.ChromeUserAgent : "Jackett/" + configService.GetVersion();
using (ClearanceHandler clearanceHandlr = new ClearanceHandler(userAgent))
{ {
clearanceHandlr.MaxRetries = 30; clearanceHandlr.MaxTries = 30;
using (HttpClientHandler clientHandlr = new HttpClientHandler using (HttpClientHandler clientHandlr = new HttpClientHandler
{ {
CookieContainer = cookies, CookieContainer = cookies,
@@ -169,10 +171,10 @@ namespace Jackett.Common.Utils.Clients
clearanceHandlr.InnerHandler = clientHandlr; clearanceHandlr.InnerHandler = clientHandlr;
using (var client = new HttpClient(clearanceHandlr)) using (var client = new HttpClient(clearanceHandlr))
{ {
if (webRequest.EmulateBrowser == true) //if (webRequest.EmulateBrowser == true)
client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent); // client.DefaultRequestHeaders.Add("User-Agent", BrowserUtil.ChromeUserAgent);
else //else
client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion()); // client.DefaultRequestHeaders.Add("User-Agent", "Jackett/" + configService.GetVersion());
HttpResponseMessage response = null; HttpResponseMessage response = null;
using (var request = new HttpRequestMessage()) using (var request = new HttpRequestMessage())