mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix CloudFlare challenges for mono/libcurl

This commit is contained in:
kaso17 2016-12-10 10:36:42 +01:00
parent fb41b2a543
commit c2520c86d7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Jackett/Utils/Clients/UnixLibCurlWebClient.cs
View File

@ -59,13 +59,14 @@ namespace Jackett.Utils.Clients
} }
} }
// Wrapper for Run which takes care of CloudFlare challenges // Wrapper for Run which takes care of CloudFlare challenges, calls RunCurl
private async Task<WebClientByteResult> RunCloudFlare(WebRequest request) override protected async Task<WebClientByteResult> Run(WebRequest request)
{ {
WebClientByteResult result = await Run(request); WebClientByteResult result = await RunCurl(request);
// check if we've received a CloudFlare challenge // check if we've received a CloudFlare challenge
if (result.Status == HttpStatusCode.ServiceUnavailable && ((request.Cookies != null && request.Cookies.Contains("__cfduid")) || result.Cookies.Contains("__cfduid"))) string[] server;
if (result.Status == HttpStatusCode.ServiceUnavailable && result.Headers.TryGetValue("server", out server) && server[0] == "cloudflare-nginx")
{ {
logger.Info("UnixLibCurlWebClient: Received a new CloudFlare challenge"); logger.Info("UnixLibCurlWebClient: Received a new CloudFlare challenge");
@ -86,7 +87,7 @@ namespace Jackett.Utils.Clients
request.Cookies = response.Cookies + request.Cookies; request.Cookies = response.Cookies + request.Cookies;
// re-run the original request with updated cf_clearance cookie // re-run the original request with updated cf_clearance cookie
result = await Run(request); result = await RunCurl(request);
// add cf_clearance cookie to the final result so we update the config for the next request // add cf_clearance cookie to the final result so we update the config for the next request
result.Cookies = response.Cookies + " " + result.Cookies; result.Cookies = response.Cookies + " " + result.Cookies;
@ -94,7 +95,7 @@ namespace Jackett.Utils.Clients
return result; return result;
} }
override protected async Task<WebClientByteResult> Run(WebRequest request) protected async Task<WebClientByteResult> RunCurl(WebRequest request)
{ {
Jackett.CurlHelper.CurlResponse response; Jackett.CurlHelper.CurlResponse response;
if (request.Type == RequestType.GET) if (request.Type == RequestType.GET)