shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

abnormal: cleaned login function (#11679)

Browse Source
This commit is contained in:
JigSaw
2021-05-05 21:05:31 +02:00
committed by GitHub
parent 7983bc9a57
commit cdbe24dfdf
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Jackett.Common/Indexers/Abnormal.cs
View File

@@ -15,7 +15,6 @@ using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig.Bespoke; using Jackett.Common.Models.IndexerConfig.Bespoke;
using Jackett.Common.Services.Interfaces; using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils; using Jackett.Common.Utils;
using Jackett.Common.Utils.Clients;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NLog; using NLog;
using WebClient = Jackett.Common.Utils.Clients.WebClient; using WebClient = Jackett.Common.Utils.Clients.WebClient;
@@ -67,8 +66,6 @@ namespace Jackett.Common.Indexers
Language = "fr-fr"; Language = "fr-fr";
Encoding = Encoding.UTF8; Encoding = Encoding.UTF8;
Type = "private"; Type = "private";
// NET::ERR_CERT_DATE_INVALID expired ‎29 ‎July ‎2020
//w.AddTrustedCertificate(new Uri(SiteLink).Host, "9cb32582b564256146616afddbdb8e7c94c428ed");
AddCategoryMapping("MOVIE|DVDR", TorznabCatType.MoviesDVD, "DVDR"); AddCategoryMapping("MOVIE|DVDR", TorznabCatType.MoviesDVD, "DVDR");
AddCategoryMapping("MOVIE|DVDRIP", TorznabCatType.MoviesSD, "DVDRIP"); AddCategoryMapping("MOVIE|DVDRIP", TorznabCatType.MoviesSD, "DVDRIP");
@@ -108,12 +105,6 @@ namespace Jackett.Common.Indexers
// Check & Validate Config // Check & Validate Config
ValidateConfig(); ValidateConfig();
// Getting login form to retrieve CSRF token
var myRequest = new Utils.Clients.WebRequest
{
Url = LoginUrl
};
// Building login form data // Building login form data
var pairs = new Dictionary<string, string> { var pairs = new Dictionary<string, string> {
{ "username", ConfigData.Username.Value }, { "username", ConfigData.Username.Value },
@@ -122,18 +113,9 @@ namespace Jackett.Common.Indexers
{ "login", "Connexion" } { "login", "Connexion" }
}; };
// Do the login
var request = new Utils.Clients.WebRequest
{
PostData = pairs,
Referer = LoginUrl,
Type = RequestType.POST,
Url = LoginUrl
};
// Perform loggin // Perform loggin
logger.Info("\nAbnormal - Perform loggin.. with " + LoginUrl); logger.Info("\nAbnormal - Perform loggin.. with " + LoginUrl);
var response = await webclient.GetResultAsync(request); var response = await RequestLoginAndFollowRedirect(LoginUrl, pairs, null, true, null, LoginUrl, true);
// Test if we are logged in // Test if we are logged in
await ConfigureIfOK(response.Cookies, response.Cookies.Contains("session="), () => await ConfigureIfOK(response.Cookies, response.Cookies.Contains("session="), () =>
@@ -148,7 +130,7 @@ namespace Jackett.Common.Indexers
// Oops, unable to login // Oops, unable to login
logger.Info("Abnormal - Login failed: \"" + message + "\" and " + left + " tries left before being banned for 6 hours !", "error"); logger.Info("Abnormal - Login failed: \"" + message + "\" and " + left + " tries left before being banned for 6 hours !", "error");
throw new ExceptionWithConfigData("Login failed: " + message, configData); throw new ExceptionWithConfigData("Abnormal - Login failed: " + message, configData);
}); });
logger.Info("-> Login Success"); logger.Info("-> Login Success");