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

Use request PathBase value to set cookie path only if it has a non-null & non-empty value

This commit is contained in:
Kiran Challa 2016-11-08 17:14:24 -08:00
parent 6d4361218e
commit 7c05d62a6e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
View File

@ -12,7 +12,9 @@ namespace Microsoft.AspNetCore.Mvc
public class CookieTempDataProviderOptions public class CookieTempDataProviderOptions
{ {
/// <summary> /// <summary>
/// The path set for a cookie. If not specified, current request's <see cref="HttpRequest.PathBase"/> value is used. /// The path set on the cookie. If set to <c>null</c>, the "path" attribute on the cookie is set to the current
/// request's <see cref="HttpRequest.PathBase"/> value. If the value of <see cref="HttpRequest.PathBase"/> is
/// <c>null</c> or empty, then the "path" attribute is set to the value of <see cref="CookieOptions.Path"/>.
/// </summary> /// </summary>
public string Path { get; set; } public string Path { get; set; }

20
src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs
View File

@ -63,13 +63,11 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
var cookieOptions = new CookieOptions() var cookieOptions = new CookieOptions()
{ {
// Check for PathBase as it can empty in which case the clients would not send the cookie
// in subsequent requests.
Path = string.IsNullOrEmpty(_options.Value.Path) ? GetPathBase(context) : _options.Value.Path,
Domain = string.IsNullOrEmpty(_options.Value.Domain) ? null : _options.Value.Domain, Domain = string.IsNullOrEmpty(_options.Value.Domain) ? null : _options.Value.Domain,
HttpOnly = true, HttpOnly = true,
Secure = context.Request.IsHttps, Secure = context.Request.IsHttps,
}; };
SetCookiePath(context, cookieOptions);
var hasValues = (values != null && values.Count > 0); var hasValues = (values != null && values.Count > 0);
if (hasValues) if (hasValues)
@ -85,14 +83,20 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
} }
} }
private string GetPathBase(HttpContext httpContext) private void SetCookiePath(HttpContext httpContext, CookieOptions cookieOptions)
{ {
var pathBase = httpContext.Request.PathBase.ToString(); if (!string.IsNullOrEmpty(_options.Value.Path))
if (string.IsNullOrEmpty(pathBase))
{ {
pathBase = "/"; cookieOptions.Path = _options.Value.Path;
}
else
{
var pathBase = httpContext.Request.PathBase.ToString();
if (!string.IsNullOrEmpty(pathBase))
{
cookieOptions.Path = pathBase;
}
} }
return pathBase;
} }
} }
} }