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) Treat "Refresh" header as redirect

Browse Source 
Fixes #812
This commit is contained in:
Qstick
2022-02-03 23:16:20 -06:00
parent 74663ea077
commit 64c1e1fa54
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Common/Http/HttpClient.cs
View File

@@ -75,7 +75,7 @@ namespace NzbDrone.Common.Http
do do
{ {
request.Url += new HttpUri(response.Headers.GetSingleValue("Location")); request.Url = new HttpUri(response.RedirectUrl);
autoRedirectChain.Add(request.Url.ToString()); autoRedirectChain.Add(request.Url.ToString());
_logger.Trace("Redirected to {0}", request.Url); _logger.Trace("Redirected to {0}", request.Url);

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

@@ -9,7 +9,7 @@ namespace NzbDrone.Common.Http
{ {
public class HttpResponse public class HttpResponse
{ {
private static readonly Regex RegexSetCookie = new Regex("^(.*?)=(.*?)(?:;|$)", RegexOptions.Compiled); private static readonly Regex RegexRefresh = new Regex("^(.*?url)=(.*?)(?:;|$)", RegexOptions.Compiled);
public HttpResponse(HttpRequest request, HttpHeader headers, CookieCollection cookies, byte[] binaryData, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK) public HttpResponse(HttpRequest request, HttpHeader headers, CookieCollection cookies, byte[] binaryData, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK)
{ {
@@ -67,7 +67,8 @@ namespace NzbDrone.Common.Http
StatusCode == HttpStatusCode.MovedPermanently || StatusCode == HttpStatusCode.MovedPermanently ||
StatusCode == HttpStatusCode.RedirectMethod || StatusCode == HttpStatusCode.RedirectMethod ||
StatusCode == HttpStatusCode.TemporaryRedirect || StatusCode == HttpStatusCode.TemporaryRedirect ||
StatusCode == HttpStatusCode.Found; StatusCode == HttpStatusCode.Found ||
Headers.ContainsKey("Refresh");
public string RedirectUrl public string RedirectUrl
{ {
@@ -76,6 +77,20 @@ namespace NzbDrone.Common.Http
var newUrl = Headers["Location"]; var newUrl = Headers["Location"];
if (newUrl == null) if (newUrl == null)
{ {
newUrl = Headers["Refresh"];
if (newUrl == null)
{
return string.Empty;
}
var match = RegexRefresh.Match(newUrl);
if (match.Success)
{
return (Request.Url += new HttpUri(match.Groups[2].Value)).FullUri;
}
return string.Empty; return string.Empty;
} }