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

Cardigann: don't try to re-login in case of a captcha

This commit is contained in:
kaso17 2017-01-27 13:04:12 +01:00
parent 666e311476
commit a89631aec4
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Jackett/Indexers/CardigannIndexer.cs
View File

@ -370,7 +370,7 @@ namespace Jackett.Indexers
var Login = Definition.Login;
if (Login == null)
return false;
return true;
if (Login.Method == "post")
{
@ -441,7 +441,11 @@ namespace Jackett.Indexers
// landingResultDocument might not be initiated if the login is caused by a relogin during a query
if (landingResultDocument == null)
{
await GetConfigurationForSetup();
var ConfigurationResult = await GetConfigurationForSetup(true);
if (ConfigurationResult == null) // got captcha
{
return false;
}
}
var form = landingResultDocument.QuerySelector(FormSelector);
@ -650,6 +654,11 @@ namespace Jackett.Indexers
}
public override async Task<ConfigurationData> GetConfigurationForSetup()
{
return await GetConfigurationForSetup(false);
}
public async Task<ConfigurationData> GetConfigurationForSetup(bool automaticlogin)
{
var Login = Definition.Login;
@ -664,9 +673,12 @@ namespace Jackett.Indexers
var htmlParser = new HtmlParser();
landingResultDocument = htmlParser.Parse(landingResult.Content);
var hasCaptcha = false;
var grecaptcha = landingResultDocument.QuerySelector(".g-recaptcha");
if (grecaptcha != null)
{
hasCaptcha = true;
var CaptchaItem = new RecaptchaItem();
CaptchaItem.Name = "Captcha";
CaptchaItem.Version = "2";
@ -684,6 +696,8 @@ namespace Jackett.Indexers
{
var captchaElement = landingResultDocument.QuerySelector(Captcha.Image);
if (captchaElement != null) {
hasCaptcha = true;
var CaptchaUrl = resolvePath(captchaElement.GetAttribute("src"));
var captchaImageData = await RequestBytesWithCookies(CaptchaUrl.ToString(), landingResult.Cookies, RequestType.GET, LoginUrl.ToString());
var CaptchaImage = new ImageItem { Name = "Captcha Image" };
@ -705,6 +719,13 @@ namespace Jackett.Indexers
}
}
if (hasCaptcha && automaticlogin)
{
configData.LastError.Value = "Got captcha during automatic login, please reconfigure manually";
logger.Error(string.Format("CardigannIndexer ({0}): Found captcha during automatic login, aborting", ID));
return null;
}
return configData;
}
@ -717,7 +738,7 @@ namespace Jackett.Indexers
SaveConfig();
IsConfigured = true;
return IndexerConfigurationStatus.Completed;
return IndexerConfigurationStatus.Completed;
}
protected string applyFilters(string Data, List<filterBlock> Filters)
@ -977,7 +998,9 @@ namespace Jackett.Indexers
if (loginNeeded)
{
logger.Info(string.Format("CardigannIndexer ({0}): Relogin required", ID));
await DoLogin();
var LoginResult = await DoLogin();
if (!LoginResult)
throw new Exception(string.Format("Relogin failed"));
await TestLogin();
response = await RequestStringWithCookies(searchUrl);
results = results = response.Content;