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

AutomaticAuthenticate = false for non ApplicationCookies

This commit is contained in:
Hao Kung 2016-06-01 12:08:03 -07:00
parent e7327fa729
commit 7a795da349
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Identity/IdentityCookieOptions.cs
View File

@ -36,6 +36,7 @@ namespace Microsoft.AspNetCore.Identity
ExternalCookie = new CookieAuthenticationOptions
{
AutomaticAuthenticate = false,
AuthenticationScheme = DefaultExternalScheme,
CookieName = DefaultExternalScheme,
ExpireTimeSpan = TimeSpan.FromMinutes(5)
@ -43,17 +44,18 @@ namespace Microsoft.AspNetCore.Identity
TwoFactorRememberMeCookie = new CookieAuthenticationOptions
{
AutomaticAuthenticate = false,
AuthenticationScheme = DefaultTwoFactorRememberMeScheme,
CookieName = DefaultTwoFactorRememberMeScheme
};
TwoFactorUserIdCookie = new CookieAuthenticationOptions
{
AutomaticAuthenticate = false,
AuthenticationScheme = DefaultTwoFactorUserIdScheme,
CookieName = DefaultTwoFactorUserIdScheme,
ExpireTimeSpan = TimeSpan.FromMinutes(5)
};
};
}
public CookieAuthenticationOptions ApplicationCookie { get; set; }

2
src/Microsoft.AspNetCore.Identity/SignInManager.cs
View File

@ -365,6 +365,8 @@ namespace Microsoft.AspNetCore.Identity
{
await Context.Authentication.SignOutAsync(Options.Cookies.ExternalCookieAuthenticationScheme);
}
// Cleanup two factor user id cookie
await Context.Authentication.SignOutAsync(Options.Cookies.TwoFactorUserIdCookieAuthenticationScheme);
if (rememberClient)
{
await RememberTwoFactorClientAsync(user);

5
test/Microsoft.AspNetCore.Identity.Test/IdentityOptionsTest.cs
View File

@ -35,6 +35,11 @@ namespace Microsoft.AspNetCore.Identity.Test
Assert.Equal(ClaimTypes.Name, options.ClaimsIdentity.UserNameClaimType);
Assert.Equal(ClaimTypes.NameIdentifier, options.ClaimsIdentity.UserIdClaimType);
Assert.Equal("AspNet.Identity.SecurityStamp", options.ClaimsIdentity.SecurityStampClaimType);
Assert.True(options.Cookies.ApplicationCookie.AutomaticAuthenticate);
Assert.False(options.Cookies.ExternalCookie.AutomaticAuthenticate);
Assert.False(options.Cookies.TwoFactorRememberMeCookie.AutomaticAuthenticate);
Assert.False(options.Cookies.TwoFactorUserIdCookie.AutomaticAuthenticate);
}
[Fact]

1
test/Microsoft.AspNetCore.Identity.Test/SignInManagerTest.cs
View File

@ -407,6 +407,7 @@ namespace Microsoft.AspNetCore.Identity.Test
// REVIEW: restore ability to test is persistent
//It.Is<AuthenticationProperties>(v => v.IsPersistent == isPersistent))).Verifiable();
auth.Setup(a => a.SignOutAsync(helper.Options.Cookies.ExternalCookieAuthenticationScheme)).Returns(Task.FromResult(0)).Verifiable();
auth.Setup(a => a.SignOutAsync(helper.Options.Cookies.TwoFactorUserIdCookieAuthenticationScheme)).Returns(Task.FromResult(0)).Verifiable();
}
else
{