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

torrentday: fix login without recaptcha. resolves #8057 (#8079) 

I can't test this very well because I always get the callenge in all domains.
With this fix the configuration dialog will open at least.
This commit is contained in:
Diego Heras 2020-04-07 17:16:16 +02:00 committed by GitHub
parent 1c34303f58
commit 4f9670413d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Jackett.Common/Indexers/TorrentDay.cs
View File

@ -132,7 +132,7 @@ namespace Jackett.Common.Indexers
//result.CookieHeader.Value = loginPage.Cookies;
UpdateCookieHeader(loginPage.Cookies); // update cookies instead of replacing them, see #3717
result.Captcha.SiteKey = dom.QuerySelector(".g-recaptcha").GetAttribute("data-sitekey");
result.Captcha.SiteKey = dom.QuerySelector(".g-recaptcha")?.GetAttribute("data-sitekey");
result.Captcha.Version = "2";
return result;
}
@ -168,17 +168,19 @@ namespace Jackett.Common.Indexers
}
var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, configData.CookieHeader.Value, true, null, LoginUrl);
await ConfigureIfOK(result.Cookies, result.Content != null && result.Content.Contains("logout.php"), () =>
await ConfigureIfOK(result.Cookies, result.Content?.Contains("logout.php") == true, () =>
{
var errorMessage = result.Content;
var parser = new HtmlParser();
var dom = parser.ParseDocument(result.Content);
var messageEl = dom.QuerySelector("#login");
foreach (var child in messageEl.QuerySelectorAll("form"))
child.Remove();
var errorMessage = messageEl.TextContent.Trim();
if (string.IsNullOrWhiteSpace(errorMessage))
errorMessage = dom.TextContent;
if (messageEl != null)
{
foreach (var child in messageEl.QuerySelectorAll("form"))
child.Remove();
errorMessage = messageEl.TextContent.Trim();
}
if (string.IsNullOrWhiteSpace(errorMessage) && result.IsRedirect)
errorMessage = $"Got a redirect to {result.RedirectingTo}, please adjust your the alternative link";