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

Create WindowsPrincipal when cloning WindowsIdentity for SignalR (#19337)

This commit is contained in:
Brennan 2020-02-26 09:54:24 -08:00 committed by GitHub
parent 03a9e8ec1c
commit 1ea10f68fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs
View File

@ -572,12 +572,31 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal
private static void CloneUser(HttpContext newContext, HttpContext oldContext)
{
if (oldContext.User.Identity is WindowsIdentity)
// If the identity is a WindowsIdentity we need to clone the User.
// This is because the WindowsIdentity uses SafeHandle's which are disposed at the end of the request
// and accessing the identity can happen outside of the request scope.
if (oldContext.User.Identity is WindowsIdentity windowsIdentity)
{
newContext.User = new ClaimsPrincipal();
var skipFirstIdentity = false;
if (oldContext.User is WindowsPrincipal)
{
// We want to explicitly create a WindowsPrincipal instead of a ClaimsPrincipal
// so methods that WindowsPrincipal overrides like 'IsInRole', work as expected.
newContext.User = new WindowsPrincipal((WindowsIdentity)(windowsIdentity.Clone()));
skipFirstIdentity = true;
}
else
{
newContext.User = new ClaimsPrincipal();
}
foreach (var identity in oldContext.User.Identities)
{
if (skipFirstIdentity)
{
skipFirstIdentity = false;
continue;
}
newContext.User.AddIdentity(identity.Clone());
}
}

57
src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
View File

@ -1639,7 +1639,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public async Task LongPollingKeepsWindowsIdentityBetweenRequests()
public async Task LongPollingKeepsWindowsPrincipalAndIdentityBetweenRequests()
{
using (StartVerifiableLog())
{
@ -1668,6 +1668,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
var windowsIdentity = WindowsIdentity.GetAnonymous();
context.User = new WindowsPrincipal(windowsIdentity);
context.User.AddIdentity(new ClaimsIdentity());
// would get stuck if EndPoint was running
await dispatcher.ExecuteAsync(context, options, app).OrTimeout();
@ -1681,6 +1682,60 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests
// This is the important check
Assert.Same(currentUser, connection.User);
Assert.IsType<WindowsPrincipal>(currentUser);
Assert.Equal(2, connection.User.Identities.Count());
Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
}
}
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
public async Task LongPollingKeepsWindowsIdentityWithoutWindowsPrincipalBetweenRequests()
{
using (StartVerifiableLog())
{
var manager = CreateConnectionManager(LoggerFactory);
var connection = manager.CreateConnection();
connection.TransportType = HttpTransportType.LongPolling;
var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory);
var context = new DefaultHttpContext();
var services = new ServiceCollection();
services.AddOptions();
services.AddSingleton<TestConnectionHandler>();
services.AddLogging();
var sp = services.BuildServiceProvider();
context.Request.Path = "/foo";
context.Request.Method = "GET";
context.RequestServices = sp;
var values = new Dictionary<string, StringValues>();
values["id"] = connection.ConnectionToken;
values["negotiateVersion"] = "1";
var qs = new QueryCollection(values);
context.Request.Query = qs;
var builder = new ConnectionBuilder(sp);
builder.UseConnectionHandler<TestConnectionHandler>();
var app = builder.Build();
var options = new HttpConnectionDispatcherOptions();
var windowsIdentity = WindowsIdentity.GetAnonymous();
context.User = new ClaimsPrincipal(windowsIdentity);
context.User.AddIdentity(new ClaimsIdentity());
// would get stuck if EndPoint was running
await dispatcher.ExecuteAsync(context, options, app).OrTimeout();
Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
var currentUser = connection.User;
var connectionHandlerTask = dispatcher.ExecuteAsync(context, options, app);
await connection.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Unblock")).AsTask().OrTimeout();
await connectionHandlerTask.OrTimeout();
// This is the important check
Assert.Same(currentUser, connection.User);
Assert.IsNotType<WindowsPrincipal>(currentUser);
Assert.Equal(2, connection.User.Identities.Count());
Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
}