Skip to content

Check for sentinel value when setting HTTP/3 error code #57934

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 5 commits into from
Sep 20, 2024
Merged

Check for sentinel value when setting HTTP/3 error code #57934

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d87133f
Check for sentinel value when setting HTTP/3 error code
amcasey Sep 18, 2024
117003a
Cover a couple other consumers of IProtocolErrorCodeFeature
amcasey Sep 19, 2024
1393ecc
Add explanatory comment
amcasey Sep 19, 2024
0f72ac7
Use a property
amcasey Sep 19, 2024
f42dbcc
Add a regression test
amcasey Sep 19, 2024
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
Prev Previous commit
Next Next commit
Use a property
  • Loading branch information
@amcasey
amcasey committed Sep 19, 2024
commit 0f72ac7855fcf19a406a37711400c03753761e09
13 changes: 5 additions & 8 deletions src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ private void UpdateHighestOpenedRequestStreamId(long streamId)
public string ConnectionId => _context.ConnectionId;
public ITimeoutControl TimeoutControl => _context.TimeoutControl;

// The default error value is -1. If it hasn't been changed before abort is called then default to HTTP/3's NoError value.
private Http3ErrorCode Http3ErrorCodeOrNoError => _errorCodeFeature.Error == -1 ? Http3ErrorCode.NoError : (Http3ErrorCode)_errorCodeFeature.Error;

public void StopProcessingNextRequest(ConnectionEndReason reason)
=> StopProcessingNextRequest(serverInitiated: true, reason);

Expand Down Expand Up @@ -505,7 +508,7 @@ public async Task ProcessRequestsAsync<TContext>(IHttpApplication<TContext> appl
}
}

var errorCode = GetErrorCodeOrNoError();
var errorCode = Http3ErrorCodeOrNoError;

// Abort active request streams.
lock (_streams)
Expand Down Expand Up @@ -907,7 +910,7 @@ public void OnInputOrOutputCompleted()
TryStopAcceptingStreams();

// Abort the connection using the error code the client used. For a graceful close, this should be H3_NO_ERROR.
Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient), GetErrorCodeOrNoError(), ConnectionEndReason.TransportCompleted);
Abort(new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient), Http3ErrorCodeOrNoError, ConnectionEndReason.TransportCompleted);
}

internal WebTransportSession OpenNewWebTransportSession(Http3Stream http3Stream)
Expand All @@ -925,12 +928,6 @@ internal WebTransportSession OpenNewWebTransportSession(Http3Stream http3Stream)
return session;
}

private Http3ErrorCode GetErrorCodeOrNoError()
{
// The default error value is -1. If it hasn't been changed before abort is called then default to HTTP/3's NoError value.
return _errorCodeFeature.Error == -1 ? Http3ErrorCode.NoError : (Http3ErrorCode)_errorCodeFeature.Error;
}

private static class GracefulCloseInitiator
{
public const int None = 0;
Expand Down