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

Fix issue with 401->403 not working with AutomaticAuthentication

This commit is contained in:
Hao Kung 2015-05-22 14:48:24 -07:00
parent 76bd1a2f17
commit e54d088c46
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationHandler.cs
View File

@ -99,6 +99,7 @@ namespace Microsoft.AspNet.Authentication.Cookies
await Options.Notifications.ValidatePrincipal(context); await Options.Notifications.ValidatePrincipal(context);
AuthenticateCalled = true;
return new AuthenticationTicket(context.Principal, context.Properties, Options.AuthenticationScheme); return new AuthenticationTicket(context.Principal, context.Properties, Options.AuthenticationScheme);
} }
catch (Exception exception) catch (Exception exception)

3
src/Microsoft.AspNet.Authentication/AuthenticationHandler.cs
View File

@ -59,7 +59,8 @@ namespace Microsoft.AspNet.Authentication
get { return _baseOptions; } get { return _baseOptions; }
} }
internal bool AuthenticateCalled { get; set; } // REVIEW: Overriding Authenticate and not calling base requires manually calling this for 401-403 to work
protected bool AuthenticateCalled { get; set; }
public IAuthenticationHandler PriorHandler { get; set; } public IAuthenticationHandler PriorHandler { get; set; }

19
test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs
View File

@ -443,19 +443,27 @@ namespace Microsoft.AspNet.Authentication.Cookies
Assert.True(transaction1.SetCookie.Contains("path=/base")); Assert.True(transaction1.SetCookie.Contains("path=/base"));
} }
[Fact] [Theory]
public async Task CookieTurns401To403IfAuthenticated() [InlineData(true)]
[InlineData(false)]
public async Task CookieTurns401To403IfAuthenticated(bool automatic)
{ {
var clock = new TestClock(); var clock = new TestClock();
var server = CreateServer(options => var server = CreateServer(options =>
{ {
options.AutomaticAuthentication = automatic;
options.SystemClock = clock; options.SystemClock = clock;
}, },
SignInAsAlice); SignInAsAlice);
var transaction1 = await SendAsync(server, "http://example.com/testpath"); var transaction1 = await SendAsync(server, "http://example.com/testpath");
var transaction2 = await SendAsync(server, "http://example.com/unauthorized", transaction1.CookieNameValue); var url = "http://example.com/unauthorized";
if (automatic)
{
url += "auto";
}
var transaction2 = await SendAsync(server, url, transaction1.CookieNameValue);
transaction2.Response.StatusCode.ShouldBe(HttpStatusCode.Forbidden); transaction2.Response.StatusCode.ShouldBe(HttpStatusCode.Forbidden);
} }
@ -547,6 +555,11 @@ namespace Microsoft.AspNet.Authentication.Cookies
var result = await context.Authentication.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme); var result = await context.Authentication.AuthenticateAsync(CookieAuthenticationDefaults.AuthenticationScheme);
context.Authentication.Challenge(CookieAuthenticationDefaults.AuthenticationScheme); context.Authentication.Challenge(CookieAuthenticationDefaults.AuthenticationScheme);
} }
else if (req.Path == new PathString("/unauthorizedauto"))
{
// Simulate Authorization failure
context.Authentication.Challenge(CookieAuthenticationDefaults.AuthenticationScheme);
}
else if (req.Path == new PathString("/protected/CustomRedirect")) else if (req.Path == new PathString("/protected/CustomRedirect"))
{ {
context.Authentication.Challenge(new AuthenticationProperties() { RedirectUri = "/CustomRedirect" }); context.Authentication.Challenge(new AuthenticationProperties() { RedirectUri = "/CustomRedirect" });