Skip to content

Fix detecting message accept encoding with whitespace #1882

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 2 commits into from
Sep 14, 2022
Merged

Fix detecting message accept encoding with whitespace #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9cbdf
Fix detecting message accept encoding with whitespace
JamesNK Sep 13, 2022
fa62275
Update test/FunctionalTests/Server/CompressionTests.cs
JamesNK Sep 13, 2022
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
2 changes: 2 additions & 0 deletions src/Grpc.AspNetCore.Server/Internal/HttpContextServerCallContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,8 @@ internal bool IsEncodingInRequestAcceptEncoding(string encoding)
segment = acceptEncoding;
}

segment = segment.Trim();

// Check segment
if (segment.SequenceEqual(encoding))
{
Expand Down
10 changes: 6 additions & 4 deletions test/FunctionalTests/Server/CompressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,13 @@ public async Task SendCompressedMessageWithoutEncodingHeader_ServerErrorResponse
AssertHasLogRpcConnectionError(StatusCode.Internal, "Request did not include grpc-encoding value with compressed message.");
}

[TestCase("gzip", true)]
[TestCase("gzip", "gzip", true)]
[TestCase("gzip", "identity, gzip", true)]
[TestCase("gzip", "gzip ", true)]
#if NET6_0_OR_GREATER
[TestCase("deflate", false)]
[TestCase("deflate", "deflate", false)]
#endif
public async Task SendCompressedMessageAndReturnResultWithNoCompressFlag_ResponseNotCompressed(string algorithmName, bool algorithmSupportedByServer)
public async Task SendCompressedMessageAndReturnResultWithNoCompressFlag_ResponseNotCompressed(string algorithmName, string messageAcceptEncoding, bool algorithmSupportedByServer)
{
// Arrange
var requestMessage = new HelloRequest
Expand All @@ -447,7 +449,7 @@ public async Task SendCompressedMessageAndReturnResultWithNoCompressFlag_Respons

var httpRequest = GrpcHttpHelper.Create("Compression.CompressionService/WriteMessageWithoutCompression");
httpRequest.Headers.Add(GrpcProtocolConstants.MessageEncodingHeader, algorithmName);
httpRequest.Headers.Add(GrpcProtocolConstants.MessageAcceptEncodingHeader, algorithmName);
httpRequest.Headers.Add(GrpcProtocolConstants.MessageAcceptEncodingHeader, messageAcceptEncoding);
httpRequest.Content = new GrpcStreamContent(requestStream);

// Act
Expand Down