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

cardigann: prevent NullRef on redirects with no location

Browse Source
This commit is contained in:
Bogdan
2023-07-07 14:03:12 +03:00
parent cf3e2a8ded
commit d0452d1b6e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using AngleSharp.Html.Dom;
using AngleSharp.Html.Parser; using AngleSharp.Html.Parser;
using AngleSharp.Text; using AngleSharp.Text;
using AngleSharp.Xml.Parser; using AngleSharp.Xml.Parser;
using Jackett.Common.Extensions;
using Jackett.Common.Helpers; using Jackett.Common.Helpers;
using Jackett.Common.Models; using Jackett.Common.Models;
using Jackett.Common.Models.IndexerConfig; using Jackett.Common.Models.IndexerConfig;
@@ -823,17 +824,18 @@ namespace Jackett.Common.Indexers
return true; return true;
} }
protected string getRedirectDomainHint(string requestUrl, string redirectUrl) protected string GetRedirectDomainHint(string requestUrl, string redirectUrl)
{ {
if (requestUrl.StartsWith(SiteLink) && !redirectUrl.StartsWith(SiteLink)) if (redirectUrl.IsNullOrWhiteSpace() || !requestUrl.StartsWith(SiteLink) || redirectUrl.StartsWith(SiteLink))
{ {
var uri = new Uri(redirectUrl);
return uri.Scheme + "://" + uri.Host + "/";
}
return null; return null;
} }
protected string getRedirectDomainHint(WebResult result) => getRedirectDomainHint(result.Request.Url, result.RedirectingTo); var uri = new Uri(redirectUrl);
return uri.Scheme + "://" + uri.Host + "/";
}
protected string GetRedirectDomainHint(WebResult result) => GetRedirectDomainHint(result.Request.Url, result.RedirectingTo);
protected async Task<bool> TestLogin() protected async Task<bool> TestLogin()
{ {
@@ -850,7 +852,7 @@ namespace Jackett.Common.Indexers
if (testResult.IsRedirect) if (testResult.IsRedirect)
{ {
var errormessage = $"Login Failed, got redirected to: {testResult.RedirectingTo}"; var errormessage = $"Login Failed, got redirected to: {testResult.RedirectingTo}";
var DomainHint = getRedirectDomainHint(testResult); var DomainHint = GetRedirectDomainHint(testResult);
if (DomainHint != null) if (DomainHint != null)
{ {
errormessage += " Try changing the indexer URL to " + DomainHint + "."; errormessage += " Try changing the indexer URL to " + DomainHint + ".";
@@ -882,7 +884,7 @@ namespace Jackett.Common.Indexers
{ {
if (response.IsRedirect) if (response.IsRedirect)
{ {
var domainHint = getRedirectDomainHint(response); var domainHint = GetRedirectDomainHint(response);
if (domainHint != null) if (domainHint != null)
{ {