mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-02-23 23:00:51 +00:00
Code Issues Releases Wiki Activity

Fuzer: add invisible recaptcha detection

Browse source
This commit is contained in:
kaso17 2018-06-23 10:26:02 +02:00
parent ef8653f7d2
commit ab37f0c2c7
1 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/Jackett.Common/Indexers/Fuzer.cs
View file

@ -23,9 +23,9 @@ namespace Jackett.Common.Indexers
private string LoginUrl { get { return SiteLink + "login.php"; } } private string LoginUrl { get { return SiteLink + "login.php"; } }
private const int MAXPAGES = 3; private const int MAXPAGES = 3;
private new ConfigurationDataBasicLogin configData private new ConfigurationDataRecaptchaLogin configData
{ {
get { return (ConfigurationDataBasicLogin)base.configData; } get { return (ConfigurationDataRecaptchaLogin)base.configData; }
set { base.configData = value; } set { base.configData = value; }
} }
@ -37,7 +37,7 @@ namespace Jackett.Common.Indexers
client: w, client: w,
logger: l, logger: l,
p: ps, p: ps,
configData: new ConfigurationDataBasicLogin()) configData: new ConfigurationDataRecaptchaLogin())
{ {
Encoding = Encoding.GetEncoding("windows-1255"); Encoding = Encoding.GetEncoding("windows-1255");
Language = "he-il"; Language = "he-il";
@ -95,9 +95,57 @@ namespace Jackett.Common.Indexers
AddCategoryMapping(76, TorznabCatType.TV, "סדרות"); AddCategoryMapping(76, TorznabCatType.TV, "סדרות");
} }
public override async Task<ConfigurationData> GetConfigurationForSetup()
{
var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
CQ cq = loginPage.Content;
var captcha = cq.Find(".g-recaptcha"); // invisible recaptcha
if (captcha.Any())
{
var result = this.configData;
result.CookieHeader.Value = loginPage.Cookies;
result.Captcha.SiteKey = captcha.Attr("data-sitekey");
result.Captcha.Version = "2";
return result;
}
else
{
var result = new ConfigurationDataBasicLogin();
result.SiteLink.Value = configData.SiteLink.Value;
result.Instructions.Value = configData.Instructions.Value;
result.Username.Value = configData.Username.Value;
result.Password.Value = configData.Password.Value;
result.CookieHeader.Value = loginPage.Cookies;
return result;
}
}
public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson) public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)
{ {
LoadValuesFromJson(configJson); LoadValuesFromJson(configJson);
if (!string.IsNullOrWhiteSpace(configData.Captcha.Cookie))
{
CookieHeader = configData.Captcha.Cookie;
try
{
var results = await PerformQuery(new TorznabQuery());
if (results.Count() == 0)
{
throw new Exception("Your cookie did not work");
}
IsConfigured = true;
SaveConfig();
return IndexerConfigurationStatus.Completed;
}
catch (Exception e)
{
IsConfigured = false;
throw new Exception("Your cookie did not work: " + e.Message);
}
}
var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty); var loginPage = await RequestStringWithCookies(LoginUrl, string.Empty);
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {