Skip to content

Add validation to ensure Cookie.Expiration is not set #8967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 2, 2019
Merged

Add validation to ensure Cookie.Expiration is not set #8967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cbb754
Update CookieExtensions.cs
HaoK Apr 1, 2019
23a4831
Update CookieTests.cs
HaoK Apr 1, 2019
9dfa9cb
Update CookieTests.cs
HaoK Apr 1, 2019
39f0848
Update CookieTests.cs
HaoK Apr 1, 2019
3bd68ae
Update CookieTests.cs
HaoK Apr 1, 2019
d2ee24a
Update CookieTests.cs
HaoK Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Security/Authentication/Cookies/src/CookieExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public static AuthenticationBuilder AddCookie(this AuthenticationBuilder builder
public static AuthenticationBuilder AddCookie(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<CookieAuthenticationOptions> configureOptions)
{
builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<CookieAuthenticationOptions>, PostConfigureCookieAuthenticationOptions>());
builder.Services.AddOptions<CookieAuthenticationOptions>(authenticationScheme).Validate(o => o.Cookie.Expiration == null, "Cookie.Expiration is ignored, use ExpireTimeSpan instead.");
return builder.AddScheme<CookieAuthenticationOptions, CookieAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
}
}
Expand Down
18 changes: 7 additions & 11 deletions src/Security/Authentication/test/CookieTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.AspNetCore.TestHost;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Xunit;

namespace Microsoft.AspNetCore.Authentication.Cookies
Expand Down Expand Up @@ -140,20 +141,15 @@ public async Task SignInCausesDefaultCookieToBeCreated()
}

[Fact]
public async Task CookieExpirationOptionIsIgnored()
public void SettingCookieExpirationOptionThrows()
{
var server = CreateServerWithServices(s => s.AddAuthentication().AddCookie(o =>
var services = new ServiceCollection();
services.AddAuthentication().AddCookie(o =>
{
o.Cookie.Name = "TestCookie";
// this is currently ignored. Users should set o.ExpireTimeSpan instead
o.Cookie.Expiration = TimeSpan.FromDays(10);
}), SignInAsAlice);

var transaction = await SendAsync(server, "http://example.com/testpath");

var setCookie = transaction.SetCookie;
Assert.StartsWith("TestCookie=", setCookie);
Assert.DoesNotContain("; expires=", setCookie);
});
var options = services.BuildServiceProvider().GetRequiredService<IOptionsMonitor<CookieAuthenticationOptions>>();
Assert.Throws<OptionsValidationException>(() => options.Get(CookieAuthenticationDefaults.AuthenticationScheme));
}

[Fact]
Expand Down