github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve parameter extraction when solving Cloudflare challenge

Browse Source
This commit is contained in:
Mike Fährmann
2020-04-22 22:03:15 +02:00
parent fb98b567fa
commit 8fe858eb0e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/cloudflare.py
View File

@@ -39,12 +39,16 @@ def solve_challenge(session, response, kwargs):
page = response.text
url = root + text.unescape(text.extract(page, 'action="', '"')[0])
params["r"] = text.extract(page, 'name="r" value="', '"')[0]
params["jschl_vc"] = text.extract(page, 'name="jschl_vc" value="', '"')[0]
params["pass"] = text.extract(page, 'name="pass" value="', '"')[0]
params["jschl_answer"] = solve_js_challenge(page, parsed.netloc)
headers["Referer"] = response.url
for inpt in text.extract_iter(page, "<input ", ">"):
name = text.extract(inpt, 'name="', '"')[0]
if name == "jschl_answer":
value = solve_js_challenge(page, parsed.netloc)
else:
value = text.unescape(text.extract(inpt, 'value="', '"')[0])
params[name] = value
time.sleep(4)
cf_kwargs["allow_redirects"] = False