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

automatically decode CloudFlare protected emails

Browse Source
This commit is contained in:
kaso17
2016-12-06 09:40:38 +01:00
parent e34ffcbaa6
commit 3f629ba7d2
3 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,15 @@ namespace Jackett.Utils.Clients
{
logger.Debug(string.Format("UnixLibCurlWebClient:GetString(Url:{0})", request.Url));
var result = await RunCloudFlare(request);
logger.Debug(string.Format("UnixLibCurlWebClient:GetString Returning {0} => {1}", result.Status, (result.Content == null ? "<NULL>" : Encoding.UTF8.GetString(result.Content))));
return Mapper.Map<WebClientStringResult>(result);
logger.Debug(string.Format("UnixLibCurlWebClient:GetString Returning {0} => {1}", result.Status, (result.Content == null ? "<NULL>" : Encoding.UTF8.GetString(result.Content))));
WebClientStringResult stringResult = Mapper.Map<WebClientStringResult>(result);
string[] server;
if (stringResult.Headers.TryGetValue("server", out server))
{
if (server[0] == "cloudflare-nginx")
stringResult.Content = BrowserUtil.DecodeCloudFlareProtectedEmailFromHTML(stringResult.Content);
}
return stringResult;
}
private string CloudFlareChallengeSolverSolve(string challengePageContent, Uri uri)
@@ -142,7 +149,11 @@ namespace Jackett.Utils.Clients
{
foreach (var header in response.HeaderList)
{
switch (header[0].ToLowerInvariant())
var key = header[0].ToLowerInvariant();
result.Headers[key] = new string[] { header[1] }; // doesn't support multiple identical headers?
switch (key)
{
case "location":
result.RedirectingTo = header[1];