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

Fixed: (Cardigann) Check redirect for /login.php

Browse Source
This commit is contained in:
Bogdan
2023-05-18 02:45:52 +03:00
parent 4c4ebdf17c
commit 48bb3196dd
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
View File

@@ -42,17 +42,19 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
{ {
if (indexerResponse.HttpResponse.HasHttpRedirect) if (indexerResponse.HttpResponse.HasHttpRedirect)
{ {
if (indexerResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("login.php")) _logger.Warn("Redirected to {0} from indexer request", indexerResponse.HttpResponse.RedirectUrl);
if (indexerResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("/login.php"))
{ {
// Remove cookie cache // Remove cookie cache
CookiesUpdater(null, null); CookiesUpdater(null, null);
throw new IndexerException(indexerResponse, "We are being redirected to the login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer."); throw new IndexerException(indexerResponse, "We are being redirected to the login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer.");
} }
throw new IndexerException(indexerResponse, $"Redirected to {indexerResponse.HttpResponse.RedirectUrl} from API request"); throw new IndexerException(indexerResponse, $"Redirected to {indexerResponse.HttpResponse.RedirectUrl} from indexer request");
} }
throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request"); throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from indexer request");
} }
var results = indexerResponse.Content; var results = indexerResponse.Content;

17
src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs
View File

@@ -42,7 +42,7 @@ public class GreatPosterWall : GazelleBase<GreatPosterWallSettings>
public override IParseIndexerResponse GetParser() public override IParseIndexerResponse GetParser()
{ {
return new GreatPosterWallParser(Settings, Capabilities); return new GreatPosterWallParser(Settings, Capabilities, _logger);
} }
protected override IndexerCapabilities SetCapabilities() protected override IndexerCapabilities SetCapabilities()
@@ -105,12 +105,15 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
public class GreatPosterWallParser : GazelleParser public class GreatPosterWallParser : GazelleParser
{ {
private readonly GreatPosterWallSettings _settings; private readonly GreatPosterWallSettings _settings;
private readonly Logger _logger;
private readonly HashSet<string> _hdResolutions = new () { "1080p", "1080i", "720p" }; private readonly HashSet<string> _hdResolutions = new () { "1080p", "1080i", "720p" };
public GreatPosterWallParser(GreatPosterWallSettings settings, IndexerCapabilities capabilities) public GreatPosterWallParser(GreatPosterWallSettings settings, IndexerCapabilities capabilities, Logger logger)
: base(settings, capabilities) : base(settings, capabilities)
{ {
_settings = settings; _settings = settings;
_logger = logger;
} }
public override IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse) public override IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
@@ -121,22 +124,24 @@ public class GreatPosterWallParser : GazelleParser
{ {
if (indexerResponse.HttpResponse.HasHttpRedirect) if (indexerResponse.HttpResponse.HasHttpRedirect)
{ {
if (indexerResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("login.php")) _logger.Warn("Redirected to {0} from indexer request", indexerResponse.HttpResponse.RedirectUrl);
if (indexerResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("/login.php"))
{ {
// Remove cookie cache // Remove cookie cache
CookiesUpdater(null, null); CookiesUpdater(null, null);
throw new IndexerException(indexerResponse, "We are being redirected to the login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer."); throw new IndexerException(indexerResponse, "We are being redirected to the login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer.");
} }
throw new IndexerException(indexerResponse, $"Redirected to {indexerResponse.HttpResponse.RedirectUrl} from API request"); throw new IndexerException(indexerResponse, $"Redirected to {indexerResponse.HttpResponse.RedirectUrl} from indexer request");
} }
throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request"); throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from indexer request");
} }
if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value)) if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
{ {
throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}"); throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from indexer request, expected {HttpAccept.Json.Value}");
} }
var jsonResponse = new HttpResponse<GreatPosterWallResponse>(indexerResponse.HttpResponse); var jsonResponse = new HttpResponse<GreatPosterWallResponse>(indexerResponse.HttpResponse);