mirror of
https://github.com/Sonarr/Sonarr.git
synced 2025-03-05 15:15:59 +02:00
Cache is disabled for json responses.
This commit is contained in:
parent
b029195260
commit
642207c68d
16
NzbDrone.Api/Extensions/CacheHeaderPipeline.cs
Normal file
16
NzbDrone.Api/Extensions/CacheHeaderPipeline.cs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
using Nancy;
|
||||||
|
|
||||||
|
namespace NzbDrone.Api.Extensions
|
||||||
|
{
|
||||||
|
public static class CacheHeaderPipeline
|
||||||
|
{
|
||||||
|
public static void Handle(NancyContext context)
|
||||||
|
{
|
||||||
|
if (context.Response.ContentType.Contains("json"))
|
||||||
|
{
|
||||||
|
context.Response.Headers.DisableCache();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -32,24 +32,27 @@ namespace NzbDrone.Api.Extensions
|
|||||||
|
|
||||||
public static JsonResponse<TModel> AsResponse<TModel>(this TModel model, HttpStatusCode statusCode = HttpStatusCode.OK)
|
public static JsonResponse<TModel> AsResponse<TModel>(this TModel model, HttpStatusCode statusCode = HttpStatusCode.OK)
|
||||||
{
|
{
|
||||||
return new JsonResponse<TModel>(model, NancySerializer) { StatusCode = statusCode };
|
var response = new JsonResponse<TModel>(model, NancySerializer) { StatusCode = statusCode };
|
||||||
|
response.Headers.DisableCache();
|
||||||
|
|
||||||
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IDictionary<string, string> DisableCache(this IDictionary<string, string> headers)
|
public static IDictionary<string, string> DisableCache(this IDictionary<string, string> headers)
|
||||||
{
|
{
|
||||||
headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
|
headers["Cache-Control"] = "no-cache, no-store, must-revalidate";
|
||||||
headers.Add("Pragma", "no-cache");
|
headers["Pragma"] = "no-cache";
|
||||||
headers.Add("Expires", "0");
|
headers["Expires"] = "0";
|
||||||
|
|
||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IDictionary<string, string> EnableCache(this IDictionary<string, string> headers)
|
public static IDictionary<string, string> EnableCache(this IDictionary<string, string> headers)
|
||||||
{
|
{
|
||||||
headers.Add("Cache-Control", "max-age=31536000 , public");
|
headers["Cache-Control"] = "max-age=31536000 , public";
|
||||||
headers.Add("Expires", "Sat, 29 Jun 2020 00:00:00 GMT");
|
headers["Expires"] = "Sat, 29 Jun 2020 00:00:00 GMT";
|
||||||
headers.Add("Last-Modified", "Sat, 29 Jun 2000 00:00:00 GMT");
|
headers["Last-Modified"] = "Sat, 29 Jun 2000 00:00:00 GMT";
|
||||||
headers.Add("Age", "193266");
|
headers["Age"] = "193266";
|
||||||
|
|
||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
@ -33,6 +33,7 @@ namespace NzbDrone.Api
|
|||||||
container.Resolve<IMessageAggregator>().PublishEvent(new ApplicationStartedEvent());
|
container.Resolve<IMessageAggregator>().PublishEvent(new ApplicationStartedEvent());
|
||||||
|
|
||||||
pipelines.AfterRequest.AddItemToStartOfPipeline(GzipCompressionPipeline.Handle);
|
pipelines.AfterRequest.AddItemToStartOfPipeline(GzipCompressionPipeline.Handle);
|
||||||
|
pipelines.AfterRequest.AddItemToEndOfPipeline(CacheHeaderPipeline.Handle);
|
||||||
|
|
||||||
ApplicationPipelines.OnError.AddItemToEndOfPipeline(container.Resolve<NzbDroneErrorPipeline>().HandleException);
|
ApplicationPipelines.OnError.AddItemToEndOfPipeline(container.Resolve<NzbDroneErrorPipeline>().HandleException);
|
||||||
}
|
}
|
||||||
|
@ -106,6 +106,7 @@
|
|||||||
<Compile Include="Directories\DirectoryModule.cs" />
|
<Compile Include="Directories\DirectoryModule.cs" />
|
||||||
<Compile Include="Episodes\EpisodeModule.cs" />
|
<Compile Include="Episodes\EpisodeModule.cs" />
|
||||||
<Compile Include="Episodes\EpisodeResource.cs" />
|
<Compile Include="Episodes\EpisodeResource.cs" />
|
||||||
|
<Compile Include="Extensions\CacheHeaderPipeline.cs" />
|
||||||
<Compile Include="Extensions\GZipPipeline.cs" />
|
<Compile Include="Extensions\GZipPipeline.cs" />
|
||||||
<Compile Include="Extensions\NancyJsonSerializer.cs" />
|
<Compile Include="Extensions\NancyJsonSerializer.cs" />
|
||||||
<Compile Include="Frontend\IAddCacheHeaders.cs" />
|
<Compile Include="Frontend\IAddCacheHeaders.cs" />
|
||||||
|
@ -5,6 +5,7 @@ using NLog;
|
|||||||
using NzbDrone.Api.REST;
|
using NzbDrone.Api.REST;
|
||||||
using NzbDrone.Common.Serializer;
|
using NzbDrone.Common.Serializer;
|
||||||
using RestSharp;
|
using RestSharp;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace NzbDrone.Integration.Test.Client
|
namespace NzbDrone.Integration.Test.Client
|
||||||
{
|
{
|
||||||
@ -99,6 +100,8 @@ namespace NzbDrone.Integration.Test.Client
|
|||||||
throw response.ErrorException;
|
throw response.ErrorException;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AssertDisableCache(response.Headers);
|
||||||
|
|
||||||
response.ErrorMessage.Should().BeBlank();
|
response.ErrorMessage.Should().BeBlank();
|
||||||
|
|
||||||
response.StatusCode.Should().Be(statusCode);
|
response.StatusCode.Should().Be(statusCode);
|
||||||
@ -106,5 +109,13 @@ namespace NzbDrone.Integration.Test.Client
|
|||||||
return Json.Deserialize<T>(response.Content);
|
return Json.Deserialize<T>(response.Content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static void AssertDisableCache(IList<Parameter> headers)
|
||||||
|
{
|
||||||
|
headers.Single(c => c.Name == "Cache-Control").Value.Should().Be("no-cache, no-store, must-revalidate");
|
||||||
|
headers.Single(c => c.Name == "Pragma").Value.Should().Be("no-cache");
|
||||||
|
headers.Single(c => c.Name == "Expires").Value.Should().Be("0");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user