From 938315cebd193487d8f10fc728e22dc5b55554d3 Mon Sep 17 00:00:00 2001
From: Diego Heras <ngosang@hotmail.es>
Date: Wed, 4 Nov 2020 23:01:58 +0100
Subject: [PATCH] core: remove legacy cloudflare code (#10110)

---
 src/Jackett.Common/Utils/BrowserUtil.cs       | 35 ++-----------------
 src/Jackett.Common/Utils/Clients/WebClient.cs |  2 --
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/Jackett.Common/Utils/BrowserUtil.cs b/src/Jackett.Common/Utils/BrowserUtil.cs
index 24ffce888..d6008981f 100644
--- a/src/Jackett.Common/Utils/BrowserUtil.cs
+++ b/src/Jackett.Common/Utils/BrowserUtil.cs
@@ -1,45 +1,14 @@
 using System;
-using System.Text.RegularExpressions;
 
 namespace Jackett.Common.Utils
 {
     public static class BrowserUtil
     {
-        // When updating these make sure they are not detected by the incapsula bot detection engine (e.g. kickasstorrent indexer)
+        // When updating these make sure they are not detected by the incapsula bot detection engine
+        // (e.g. kickasstorrent indexer)
         public static string ChromeUserAgent => Environment.OSVersion.Platform == PlatformID.Unix ?
             "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36" :
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36";
 
-        // This can be used to decode e-mail addresses protected by cloudflare
-        public static string DecodeCloudFlareProtectedEmail(string input)
-        {
-            var key = Convert.ToInt32(input.Substring(0, 2), 16);
-            var result = "";
-            for (var i = 2; i < input.Length - 1; i += 2)
-            {
-                var hexChar = input.Substring(i, 2);
-                var intChar = Convert.ToInt32(hexChar, 16) ^ key;
-                var strChar = Convert.ToChar(intChar);
-                result += strChar;
-            }
-            return result;
-        }
-
-        // decode cloudflare protected emails in a HTML document
-        public static string DecodeCloudFlareProtectedEmailFromHTML(string html)
-        {
-            var CFEMailRegex = new Regex("<span class=\"__cf_email__\" data-cfemail=\"(\\w+)\">\\[email&#160;protected\\]<\\/span><script data-cfhash='[\\w]+' type=\"text\\/javascript\">.*?<\\/script>", RegexOptions.Compiled);
-            var CFEMailRegexMatches = CFEMailRegex.Match(html);
-
-            while (CFEMailRegexMatches.Success)
-            {
-                var all = CFEMailRegexMatches.Groups[0].Value;
-                var cfemail = CFEMailRegexMatches.Groups[1].Value;
-                var decoded = DecodeCloudFlareProtectedEmail(cfemail);
-                html = html.Replace(all, decoded);
-                CFEMailRegexMatches = CFEMailRegexMatches.NextMatch();
-            }
-            return html;
-        }
     }
 }
diff --git a/src/Jackett.Common/Utils/Clients/WebClient.cs b/src/Jackett.Common/Utils/Clients/WebClient.cs
index 3949cfab7..b1094e1b0 100644
--- a/src/Jackett.Common/Utils/Clients/WebClient.cs
+++ b/src/Jackett.Common/Utils/Clients/WebClient.cs
@@ -193,8 +193,6 @@ namespace Jackett.Common.Utils.Clients
                                  }{bodySize} bytes{body}");
             }
 
-            if (result.Headers.TryGetValue("server", out var server) && server[0] == "cloudflare-nginx")
-                result.ContentString = BrowserUtil.DecodeCloudFlareProtectedEmailFromHTML(result.ContentString);
             return result;
         }