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 redirect handling fails for relative location headers

Browse Source
This commit is contained in:
Qstick
2021-06-06 12:57:28 -04:00
parent fa05dbc642
commit d9e211472b
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/NzbDrone.Common/Http/HttpResponse.cs
View File

@@ -62,6 +62,20 @@ namespace NzbDrone.Common.Http
StatusCode == HttpStatusCode.TemporaryRedirect || StatusCode == HttpStatusCode.TemporaryRedirect ||
StatusCode == HttpStatusCode.Found; StatusCode == HttpStatusCode.Found;
public string RedirectUrl
{
get
{
var newUrl = Headers["Location"];
if (newUrl == null || newUrl.IsNullOrWhiteSpace())
{
return string.Empty;
}
return (Request.Url += new HttpUri(newUrl)).FullUri;
}
}
public string[] GetCookieHeaders() public string[] GetCookieHeaders()
{ {
return Headers.GetValues("Set-Cookie") ?? Array.Empty<string>(); return Headers.GetValues("Set-Cookie") ?? Array.Empty<string>();

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

@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK) if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
{ {
// Remove cookie cache // Remove cookie cache
if (indexerResponse.HttpResponse.HasHttpRedirect && indexerResponse.HttpResponse.Headers["Location"] if (indexerResponse.HttpResponse.HasHttpRedirect && indexerResponse.HttpResponse.RedirectUrl
.ContainsIgnoreCase("login.php")) .ContainsIgnoreCase("login.php"))
{ {
CookiesUpdater(null, null); CookiesUpdater(null, null);

4
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
View File

@@ -635,14 +635,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
{ {
if (requestUrl.StartsWith(SiteLink) && !redirectUrl.StartsWith(SiteLink)) if (requestUrl.StartsWith(SiteLink) && !redirectUrl.StartsWith(SiteLink))
{ {
var uri = new Uri(redirectUrl); var uri = new HttpUri(redirectUrl);
return uri.Scheme + "://" + uri.Host + "/"; return uri.Scheme + "://" + uri.Host + "/";
} }
return null; return null;
} }
protected string GetRedirectDomainHint(HttpResponse result) => GetRedirectDomainHint(result.Request.Url.ToString(), result.Headers.GetSingleValue("Location")); protected string GetRedirectDomainHint(HttpResponse result) => GetRedirectDomainHint(result.Request.Url.ToString(), result.RedirectUrl);
protected async Task<HttpResponse> HandleRequest(RequestBlock request, Dictionary<string, object> variables = null, string referer = null) protected async Task<HttpResponse> HandleRequest(RequestBlock request, Dictionary<string, object> variables = null, string referer = null)
{ {

2
src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs
View File

@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK) if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
{ {
// Remove cookie cache // Remove cookie cache
if (indexerResponse.HttpResponse.HasHttpRedirect && indexerResponse.HttpResponse.Headers["Location"] if (indexerResponse.HttpResponse.HasHttpRedirect && indexerResponse.HttpResponse.RedirectUrl
.ContainsIgnoreCase("login.php")) .ContainsIgnoreCase("login.php"))
{ {
CookiesUpdater(null, null); CookiesUpdater(null, null);