-
Notifications
You must be signed in to change notification settings - Fork 783
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.
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
Fix HttpContext race condition by copying values to reader and writer #2294
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
test/Grpc.AspNetCore.Server.Tests/DuplexStreamingServerCallHandlerTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
#region Copyright notice and license | ||
|
||
// Copyright 2019 The gRPC Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
#endregion | ||
|
||
using Grpc.AspNetCore.Server.Internal.CallHandlers; | ||
using Grpc.AspNetCore.Server.Tests.TestObjects; | ||
using Grpc.Core; | ||
using Grpc.Shared.Server; | ||
using Grpc.Tests.Shared; | ||
using Microsoft.AspNetCore.Http; | ||
using Microsoft.AspNetCore.Http.Features; | ||
using Microsoft.Extensions.Logging.Abstractions; | ||
using NUnit.Framework; | ||
|
||
namespace Grpc.AspNetCore.Server.Tests; | ||
|
||
[TestFixture] | ||
public class DuplexStreamingServerCallHandlerTests | ||
{ | ||
private static readonly Marshaller<TestMessage> _marshaller = new Marshaller<TestMessage>((message, context) => { context.Complete(Array.Empty<byte>()); }, context => new TestMessage()); | ||
|
||
[Test] | ||
public async Task HandleCallAsync_ConcurrentReadAndWrite_Success() | ||
{ | ||
// Arrange | ||
var invoker = new DuplexStreamingServerMethodInvoker<TestService, TestMessage, TestMessage>( | ||
(service, reader, writer, context) => | ||
{ | ||
var message = new TestMessage(); | ||
var readTask = Task.Run(() => reader.MoveNext()); | ||
var writeTask = Task.Run(() => writer.WriteAsync(message)); | ||
return Task.WhenAll(readTask, writeTask); | ||
}, | ||
new Method<TestMessage, TestMessage>(MethodType.DuplexStreaming, "test", "test", _marshaller, _marshaller), | ||
HttpContextServerCallContextHelper.CreateMethodOptions(), | ||
new TestGrpcServiceActivator<TestService>()); | ||
var handler = new DuplexStreamingServerCallHandler<TestService, TestMessage, TestMessage>(invoker, NullLoggerFactory.Instance); | ||
|
||
// Verify there isn't a race condition when reading/writing on seperate threads. | ||
// This test primarily exists to ensure that the stream reader and stream writer aren't accessing non-thread safe APIs on HttpContext. | ||
for (var i = 0; i < 10_000; i++) | ||
{ | ||
var httpContext = HttpContextHelpers.CreateContext(); | ||
|
||
// Act | ||
await handler.HandleCallAsync(httpContext); | ||
|
||
// Assert | ||
var trailers = httpContext.Features.Get<IHttpResponseTrailersFeature>()!.Trailers; | ||
Assert.AreEqual("0", trailers["grpc-status"].ToString()); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you explain both the 6.0 comment as well as this whole PR?
From my understanding; If you're using the cancellation token on a background thread it might be disposed instead of canceled when the HttpContext is reused. And if you access the token property after it's been reset you might be using a token from another request.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Root problem: dotnet/aspnetcore#42040
The fix it to access the cancellation token on the feature directly.
HttpContext.RequestAborted
isn't thread-safe but the feature is.re: .NET 6. I observed that the cancellation token returned by
HttpContext.RequestAborted
and cached at the start of the request behaved strangely. It wouldn't immediately be canceled when the request was aborted. The cachedHttpContext.RequestAborted
value appeared to be different from the value after the abort happened (but while the request was still in progress, so the value isn't coming from another request). I didn't investigate why I got this odd behavior in .NET 6 since there was a workaround - access the token from the feature - and .NET 7 and .NET 8 behaved how I expected.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, so gRPC isn't using the token after the middleware returns? That's what my comment was focused on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. This is in the context of one request.