huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also set no-store when we set no-cache in response cache control headers (#22842)

This commit is contained in:
John Luo 2020-06-11 20:38:54 -07:00 committed by GitHub
parent 20770811a4
commit ef9a3662d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs
View File

@ -187,7 +187,8 @@ namespace Microsoft.AspNetCore.Hosting
return context => return context =>
{ {
context.Response.StatusCode = 500; context.Response.StatusCode = 500;
context.Response.Headers[HeaderNames.CacheControl] = "no-cache"; context.Response.Headers[HeaderNames.CacheControl] = "no-cache,no-store";
context.Response.Headers[HeaderNames.Pragma] = "no-cache";
context.Response.ContentType = "text/html; charset=utf-8"; context.Response.ContentType = "text/html; charset=utf-8";
return errorPage.ExecuteAsync(context); return errorPage.ExecuteAsync(context);
}; };

3
src/Hosting/Hosting/src/Internal/WebHost.cs
View File

@ -284,7 +284,8 @@ namespace Microsoft.AspNetCore.Hosting
return context => return context =>
{ {
context.Response.StatusCode = 500; context.Response.StatusCode = 500;
context.Response.Headers[HeaderNames.CacheControl] = "no-cache"; context.Response.Headers[HeaderNames.CacheControl] = "no-cache,no-store";
context.Response.Headers[HeaderNames.Pragma] = "no-cache";
return errorPage.ExecuteAsync(context); return errorPage.ExecuteAsync(context);
}; };
} }

4
src/Middleware/Diagnostics.EntityFrameworkCore/src/MigrationsEndPointMiddleware.cs
View File

@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
context.Response.StatusCode = (int)HttpStatusCode.NoContent; context.Response.StatusCode = (int)HttpStatusCode.NoContent;
context.Response.Headers.Add("Pragma", new[] { "no-cache" }); context.Response.Headers.Add("Pragma", new[] { "no-cache" });
context.Response.Headers.Add("Cache-Control", new[] { "no-cache" }); context.Response.Headers.Add("Cache-Control", new[] { "no-cache,no-store" });
_logger.MigrationsApplied(db.GetType().FullName); _logger.MigrationsApplied(db.GetType().FullName);
} }
@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
response.StatusCode = (int)HttpStatusCode.BadRequest; response.StatusCode = (int)HttpStatusCode.BadRequest;
response.Headers.Add("Pragma", new[] { "no-cache" }); response.Headers.Add("Pragma", new[] { "no-cache" });
response.Headers.Add("Cache-Control", new[] { "no-cache" }); response.Headers.Add("Cache-Control", new[] { "no-cache,no-store" });
response.ContentType = "text/plain"; response.ContentType = "text/plain";
// Padding to >512 to ensure IE doesn't hide the message // Padding to >512 to ensure IE doesn't hide the message

2
src/Middleware/Diagnostics/src/ExceptionHandler/ExceptionHandlerMiddleware.cs
View File

@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Diagnostics
private static Task ClearCacheHeaders(object state) private static Task ClearCacheHeaders(object state)
{ {
var headers = ((HttpResponse)state).Headers; var headers = ((HttpResponse)state).Headers;
headers[HeaderNames.CacheControl] = "no-cache"; headers[HeaderNames.CacheControl] = "no-cache,no-store";
headers[HeaderNames.Pragma] = "no-cache"; headers[HeaderNames.Pragma] = "no-cache";
headers[HeaderNames.Expires] = "-1"; headers[HeaderNames.Expires] = "-1";
headers.Remove(HeaderNames.ETag); headers.Remove(HeaderNames.ETag);

10
src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs
View File

@ -164,9 +164,8 @@ namespace Microsoft.AspNetCore.Diagnostics
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
Assert.Equal(expectedResponseBody, await response.Content.ReadAsStringAsync()); Assert.Equal(expectedResponseBody, await response.Content.ReadAsStringAsync());
IEnumerable<string> values; IEnumerable<string> values;
Assert.True(response.Headers.TryGetValues("Cache-Control", out values)); Assert.True(response.Headers.CacheControl.NoCache);
Assert.Single(values); Assert.True(response.Headers.CacheControl.NoStore);
Assert.Equal("no-cache", values.First());
Assert.True(response.Headers.TryGetValues("Pragma", out values)); Assert.True(response.Headers.TryGetValues("Pragma", out values));
Assert.Single(values); Assert.Single(values);
Assert.Equal("no-cache", values.First()); Assert.Equal("no-cache", values.First());
@ -214,9 +213,8 @@ namespace Microsoft.AspNetCore.Diagnostics
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
Assert.Equal(expectedResponseBody, await response.Content.ReadAsStringAsync()); Assert.Equal(expectedResponseBody, await response.Content.ReadAsStringAsync());
IEnumerable<string> values; IEnumerable<string> values;
Assert.True(response.Headers.TryGetValues("Cache-Control", out values)); Assert.True(response.Headers.CacheControl.NoCache);
Assert.Single(values); Assert.True(response.Headers.CacheControl.NoStore);
Assert.Equal("no-cache", values.First());
Assert.True(response.Headers.TryGetValues("Pragma", out values)); Assert.True(response.Headers.TryGetValues("Pragma", out values));
Assert.Single(values); Assert.Single(values);
Assert.Equal("no-cache", values.First()); Assert.Equal("no-cache", values.First());

2
src/Middleware/Session/src/SessionMiddleware.cs
View File

@ -161,7 +161,7 @@ namespace Microsoft.AspNetCore.Session
response.Cookies.Append(_options.Cookie.Name, _cookieValue, cookieOptions); response.Cookies.Append(_options.Cookie.Name, _cookieValue, cookieOptions);
var responseHeaders = response.Headers; var responseHeaders = response.Headers;
responseHeaders[HeaderNames.CacheControl] = "no-cache"; responseHeaders[HeaderNames.CacheControl] = "no-cache,no-store";
responseHeaders[HeaderNames.Pragma] = "no-cache"; responseHeaders[HeaderNames.Pragma] = "no-cache";
responseHeaders[HeaderNames.Expires] = "-1"; responseHeaders[HeaderNames.Expires] = "-1";
} }

3
src/Security/Authentication/Cookies/src/CookieAuthenticationHandler.cs
View File

@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
public class CookieAuthenticationHandler : SignInAuthenticationHandler<CookieAuthenticationOptions> public class CookieAuthenticationHandler : SignInAuthenticationHandler<CookieAuthenticationOptions>
{ {
private const string HeaderValueNoCache = "no-cache"; private const string HeaderValueNoCache = "no-cache";
private const string HeaderValueNoCacheNoStore = "no-cache,no-store";
private const string HeaderValueEpocDate = "Thu, 01 Jan 1970 00:00:00 GMT"; private const string HeaderValueEpocDate = "Thu, 01 Jan 1970 00:00:00 GMT";
private const string SessionIdClaim = "Microsoft.AspNetCore.Authentication.Cookies-SessionId"; private const string SessionIdClaim = "Microsoft.AspNetCore.Authentication.Cookies-SessionId";
@ -374,7 +375,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
private async Task ApplyHeaders(bool shouldRedirectToReturnUrl, AuthenticationProperties properties) private async Task ApplyHeaders(bool shouldRedirectToReturnUrl, AuthenticationProperties properties)
{ {
Response.Headers[HeaderNames.CacheControl] = HeaderValueNoCache; Response.Headers[HeaderNames.CacheControl] = HeaderValueNoCacheNoStore;
Response.Headers[HeaderNames.Pragma] = HeaderValueNoCache; Response.Headers[HeaderNames.Pragma] = HeaderValueNoCache;
Response.Headers[HeaderNames.Expires] = HeaderValueEpocDate; Response.Headers[HeaderNames.Expires] = HeaderValueEpocDate;

3
src/Security/Authentication/test/CookieTests.cs
View File

@ -138,6 +138,9 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
Assert.DoesNotContain("; expires=", setCookie); Assert.DoesNotContain("; expires=", setCookie);
Assert.DoesNotContain("; domain=", setCookie); Assert.DoesNotContain("; domain=", setCookie);
Assert.DoesNotContain("; secure", setCookie); Assert.DoesNotContain("; secure", setCookie);
Assert.True(transaction.Response.Headers.CacheControl.NoCache);
Assert.True(transaction.Response.Headers.CacheControl.NoStore);
Assert.Equal("no-cache", transaction.Response.Headers.Pragma.ToString());
} }
[Fact] [Fact]

3
src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsServerTransport.cs
View File

@ -35,7 +35,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports
public async Task ProcessRequestAsync(HttpContext context, CancellationToken token) public async Task ProcessRequestAsync(HttpContext context, CancellationToken token)
{ {
context.Response.ContentType = "text/event-stream"; context.Response.ContentType = "text/event-stream";
context.Response.Headers[HeaderNames.CacheControl] = "no-cache"; context.Response.Headers[HeaderNames.CacheControl] = "no-cache,no-store";
context.Response.Headers[HeaderNames.Pragma] = "no-cache";
// Make sure we disable all response buffering for SSE // Make sure we disable all response buffering for SSE
var bufferingFeature = context.Features.Get<IHttpResponseBodyFeature>(); var bufferingFeature = context.Features.Get<IHttpResponseBodyFeature>();

3
src/SignalR/common/Http.Connections/test/ServerSentEventsTests.cs
View File

@ -31,7 +31,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
await sse.ProcessRequestAsync(context, context.RequestAborted); await sse.ProcessRequestAsync(context, context.RequestAborted);
Assert.Equal("text/event-stream", context.Response.ContentType); Assert.Equal("text/event-stream", context.Response.ContentType);
Assert.Equal("no-cache", context.Response.Headers["Cache-Control"]); Assert.Equal("no-cache,no-store", context.Response.Headers["Cache-Control"]);
Assert.Equal("no-cache", context.Response.Headers["Pragma"]);
} }
} }