From 7ee8825e7cf40e775568d1d29e72ea192c2892d6 Mon Sep 17 00:00:00 2001
From: Sraq-Zit <34834428+Sraq-Zit@users.noreply.github.com>
Date: Sat, 20 Jun 2020 02:27:03 +0100
Subject: [PATCH 1/3] Fixed kissanime-cf new challenge

---
 cfscrape/__init__.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/cfscrape/__init__.py b/cfscrape/__init__.py
index 251dc29..fd23e88 100644
--- a/cfscrape/__init__.py
+++ b/cfscrape/__init__.py
@@ -173,7 +173,7 @@ def solve_cf_challenge(self, resp, **original_kwargs):
                 for param in re.search(r'action=\"(.*?)\"', challenge_form, flags=re.S).group(1).split('?')[1].split('&'):
                     cloudflare_kwargs["params"].update({param.split('=')[0]:param.split('=')[1]})
 
-            for input_ in re.findall(r'\<input.*?(?:\/>|\<\/input\>)', challenge_form, flags=re.S):
+            for input_ in re.findall(r'[^-] \<input.*?(?:\/>|\<\/input\>)', challenge_form, flags=re.S):
                 if re.search(r'name=\"(.*?)\"',input_, flags=re.S).group(1) != 'jschl_answer':
                     if method == 'POST':
                         cloudflare_kwargs["data"].update({re.search(r'name=\"(.*?)\"',input_, flags=re.S).group(1):
@@ -246,22 +246,23 @@ def solve_cf_challenge(self, resp, **original_kwargs):
 
     def solve_challenge(self, body, domain):
         try:
-            all_scripts = re.findall(r'\<script type\=\"text\/javascript\"\>\n(.*?)\<\/script\>',body, flags=re.S)
-            javascript = next(filter(lambda w: "jschl-answer" in w,all_scripts)) #find the script tag which would have obfuscated js
+            javascript = re.search(r'\<script type\=\"text\/javascript\"\>\n(.*?)\<\/script\>',body, flags=re.S).group(1) # find javascript
+
             challenge, ms = re.search(
                 r"setTimeout\(function\(\){\s*(var "
-                r"s,t,o,p,b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value\s*=.+?)\r?\n"
-                r"(?:[^{<>]*},\s*(\d{4,}))?",
+                r"s,t,o,p, b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value\s*=.+?)\r?\n"
+                r"(?:[^{<>]*},\s*(\d{4,}))",
                 javascript, flags=re.S
             ).groups()
 
             # The challenge requires `document.getElementById` to get this content.
             # Future proofing would require escaping newlines and double quotes
-            innerHTML = ''
+            innerHTML = {}
             for i in javascript.split(';'):
                 if i.strip().split('=')[0].strip() == 'k':      # from what i found out from pld example K var in
                     k = i.strip().split('=')[1].strip(' \'')    #  javafunction is for innerHTML this code to find it
-                    innerHTML = re.search(r'\<div.*?id\=\"'+k+r'\".*?\>(.*?)\<\/div\>',body).group(1) #find innerHTML
+                    k = re.finditer(r'\<div.*?id\=\"('+k+r'\d+)\".*?\>(.*?)\<\/div\>',body) #find innerHTML
+                    innerHTML = {x.group(1): x.group(2) for x in k}
 
             # Prefix the challenge with a fake document object.
             # Interpolate the domain, div contents, and JS challenge.
@@ -271,8 +272,9 @@ def solve_challenge(self, body, domain):
                     createElement: function () {
                       return { firstChild: { href: "http://%s/" } }
                     },
-                    getElementById: function () {
-                      return {"innerHTML": "%s"};
+                    getElementById: function (id) {
+                      var data = %s;
+                      return {"innerHTML": data[id]};
                     }
                   };
 
@@ -282,6 +284,7 @@ def solve_challenge(self, body, domain):
                 innerHTML,
                 challenge,
             )
+            challenge = re.sub(r'setInterval\(.+?\d\),', '', challenge)
             # Encode the challenge for security while preserving quotes and spacing.
             challenge = b64encode(challenge.encode("utf-8")).decode("ascii")
             # Use the provided delay, parsed delay, or default to 8 secs
@@ -336,7 +339,7 @@ def solve_challenge(self, body, domain):
         except Exception:
             logging.error("Error executing Cloudflare IUAM Javascript. %s" % BUG_REPORT)
             raise
-
+        
         try:
             float(result)
         except Exception:

From 3b924a7c29b2bf1ef34f7d69d2ba5c3f9ef11027 Mon Sep 17 00:00:00 2001
From: sraqzit <34834428+Sraq-Zit@users.noreply.github.com>
Date: Wed, 24 Jun 2020 14:52:06 +0100
Subject: [PATCH 2/3] Version change

---
 cfscrape/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfscrape/__init__.py b/cfscrape/__init__.py
index fd23e88..3adf83d 100644
--- a/cfscrape/__init__.py
+++ b/cfscrape/__init__.py
@@ -20,7 +20,7 @@
 
 from .user_agents import USER_AGENTS
 
-__version__ = "2.1.1"
+__version__ = "2.1.1-alpha"
 
 DEFAULT_USER_AGENT = random.choice(USER_AGENTS)
 

From 954670774887e028cf53f197b95db0d7076c6518 Mon Sep 17 00:00:00 2001
From: sraqzit <34834428+Sraq-Zit@users.noreply.github.com>
Date: Mon, 6 Jul 2020 00:29:04 +0100
Subject: [PATCH 3/3] Changed regexp for js to match that of cloudflare

---
 cfscrape/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfscrape/__init__.py b/cfscrape/__init__.py
index 3adf83d..95cfcd1 100644
--- a/cfscrape/__init__.py
+++ b/cfscrape/__init__.py
@@ -250,7 +250,7 @@ def solve_challenge(self, body, domain):
 
             challenge, ms = re.search(
                 r"setTimeout\(function\(\){\s*(var "
-                r"s,t,o,p, b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value\s*=.+?)\r?\n"
+                r"s,t,o,p, b,r,e,a,k,i,n,g,cpo,f.+?\r?\n[\s\S]+?a\.value\s*=.+?)\r?\n"
                 r"(?:[^{<>]*},\s*(\d{4,}))",
                 javascript, flags=re.S
             ).groups()