Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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
MihaZupan merged 1 commit into from
Dec 27, 2022
Merged

Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3 #79281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
{
public const long H3_NO_ERROR = 0x100;
public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
return (controlStream, requestStream);
}

public async Task EstablishControlStreamAsync()
public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
{
_outboundControlStream = await OpenUnidirectionalStreamAsync();
await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
await _outboundControlStream.SendSettingsFrameAsync();
await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
}

public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down
9 changes: 7 additions & 2 deletions src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
_cert.Dispose();
}

private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
{
QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

await connection.EstablishControlStreamAsync();
await connection.EstablishControlStreamAsync(settingsEntries);
return connection;
}

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
return await EstablishHttp3ConnectionAsync();
}

public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
{
return EstablishHttp3ConnectionAsync(settingsEntries);
}

public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
{
await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down
15 changes: 6 additions & 9 deletions src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

internal sealed class Http3LoopbackStream : IAsyncDisposable
public sealed class Http3LoopbackStream : IAsyncDisposable
{
private const int MaximumVarIntBytes = 8;
private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
}

public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
{
settings ??= Array.Empty<(long settingId, long settingValue)>();

var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

int bytesWritten = 0;

foreach ((long settingId, long settingValue) in settings)
foreach (SettingsEntry setting in settingsEntries)
{
bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
}

await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Http/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
<data name="net_http_buffer_insufficient_length" xml:space="preserve">
<value>The buffer was not long enough.</value>
</data>
<data name="net_http_request_headers_exceeded_length" xml:space="preserve">
<value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
</data>
<data name="net_http_response_headers_exceeded_length" xml:space="preserve">
<value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
</data>
Expand Down
63 changes: 54 additions & 9 deletions src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
private readonly Channel<WriteQueueEntry> _writeChannel;
private bool _lastPendingWriterShouldFlush;

// Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
// https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

// This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
// (1) We received a GOAWAY frame from the server
// (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
_nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
_keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
if (maxHeaderListSize > 0)
{
// Previous connections to the same host advertised a limit.
// Use this as an initial value before we receive the SETTINGS frame.
_maxHeaderListSize = maxHeaderListSize;
}

if (HttpTelemetry.Log.IsEnabled())
{
HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
settings = settings.Slice(4);

if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

switch ((SettingId)settingId)
{
case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
}
break;

case SettingId.MaxHeaderListSize:
_maxHeaderListSize = settingValue;
_pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
break;

default:
// All others are ignored because we don't care about them.
// Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
headerBuffer.Commit(bytes.Length);
}

private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
{
if (NetEventSource.Log.IsEnabled()) Trace("");

HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

ref string[]? tmpHeaderValuesArray = ref t_headerValues;
foreach (HeaderEntry header in headers.GetEntries())

ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
int headerListSize = entries.Length * HeaderField.RfcOverhead;

foreach (HeaderEntry header in entries)
{
int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
// The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
{
// The length of the encoded name may be shorter than the actual name.
// Ensure that headerListSize is always >= of the actual size.
headerListSize += knownHeader.Name.Length;

if (knownHeader == KnownHeaders.TE)
{
// HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
}
}

return headerListSize;
}

private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

if (request.HasHeaders && request.Headers.Host != null)
if (request.HasHeaders && request.Headers.Host is string host)
{
WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
}
else
{
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
}

int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

if (request.HasHeaders)
{
if (request.Headers.Protocol != null)
{
WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
headerListSize += HeaderField.RfcOverhead;
}

WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
}

// Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
if (cookiesFromContainer != string.Empty)
{
WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
}
}

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
{
WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
}
}
else
{
WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
}

// The headerListSize is an approximation of the total header length.
// This is acceptable as long as the value is always >= the actual length.
// We must avoid ever sending more than the server allowed.
// This approach must be revisted if we ever support the dynamic table or compression when sending requests.
headerListSize += headerBuffer.ActiveLength;

uint maxHeaderListSize = _maxHeaderListSize;
if ((uint)headerListSize > maxHeaderListSize)
{
throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
}
}

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
// streams are created and started in order.
await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
{
if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

s.thisRef.AddStream(s.http2Stream);

if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

Span<byte> span = writeBuffer.Span;

// Copy the HEADERS frame.
Expand Down
19 changes: 15 additions & 4 deletions src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
// Our control stream.
private QuicStream? _clientControl;

// Current SETTINGS from the server.
private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
// Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
// https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

// Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

public HttpAuthority Authority => _authority;
public HttpConnectionPool Pool => _pool;
public int MaximumRequestHeadersLength => _maximumHeadersLength;
public uint MaxHeaderListSize => _maxHeaderListSize;
public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
public Exception? AbortException => Volatile.Read(ref _abortException);
private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
_altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
}

uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
if (maxHeaderListSize > 0)
{
// Previous connections to the same host advertised a limit.
// Use this as an initial value before we receive the SETTINGS frame.
_maxHeaderListSize = maxHeaderListSize;
}

if (HttpTelemetry.Log.IsEnabled())
{
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

buffer.Discard(bytesRead);

if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

switch ((Http3SettingType)settingId)
{
case Http3SettingType.MaxHeaderListSize:
_maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
_maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
_pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
break;
case Http3SettingType.ReservedHttp2EnablePush:
case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3#79281

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

MihaZupan
merged 1 commit into

from

Dec 27, 2022
 Merged


Respect SETTINGS_MAX_HEADER_LIST_SIZE on HTTP/2 and HTTP/3
#79281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 3 additions & 3 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@

namespace System.Net.Test.Common
{
internal sealed class Http3LoopbackConnection : GenericLoopbackConnection
public sealed class Http3LoopbackConnection : GenericLoopbackConnection
 {
 public const long H3_NO_ERROR = 0x100;
 public const long H3_GENERAL_PROTOCOL_ERROR = 0x101;
Expand DownExpand Up@@ -188,11 +188,11 @@ public async Task<Http3LoopbackStream> AcceptRequestStreamAsync()
 return (controlStream, requestStream);
 }

 public async Task EstablishControlStreamAsync()
 public async Task EstablishControlStreamAsync(SettingsEntry[] settingsEntries)
 {
 _outboundControlStream = await OpenUnidirectionalStreamAsync();
 await _outboundControlStream.SendUnidirectionalStreamTypeAsync(Http3LoopbackStream.ControlStream);
 await _outboundControlStream.SendSettingsFrameAsync();
 await _outboundControlStream.SendSettingsFrameAsync(settingsEntries);
 }

 public override async Task<byte[]> ReadRequestBodyAsync()
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,12 +66,12 @@ public override void Dispose()
 _cert.Dispose();
 }

 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync()
 private async Task<Http3LoopbackConnection> EstablishHttp3ConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 QuicConnection con = await _listener.AcceptConnectionAsync().ConfigureAwait(false);
 Http3LoopbackConnection connection = new Http3LoopbackConnection(con);

 await connection.EstablishControlStreamAsync();
 await connection.EstablishControlStreamAsync(settingsEntries);
 return connection;
 }

Expand All@@ -80,6 +80,11 @@ public override async Task<GenericLoopbackConnection> EstablishGenericConnection
 return await EstablishHttp3ConnectionAsync();
 }

 public Task<Http3LoopbackConnection> EstablishConnectionAsync(params SettingsEntry[] settingsEntries)
 {
 return EstablishHttp3ConnectionAsync(settingsEntries);
 }

 public override async Task AcceptConnectionAsync(Func<GenericLoopbackConnection, Task> funcAsync)
 {
 await using Http3LoopbackConnection con = await EstablishHttp3ConnectionAsync().ConfigureAwait(false);
Expand Down

15 changes: 6 additions & 9 deletions
src/libraries/Common/tests/System/Net/Http/Http3LoopbackStream.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,8 +14,7 @@

namespace System.Net.Test.Common
{

 internal sealed class Http3LoopbackStream : IAsyncDisposable
 public sealed class Http3LoopbackStream : IAsyncDisposable
 {
 private const int MaximumVarIntBytes = 8;
 private const long VarIntMax = (1L << 62) - 1;
Expand DownExpand Up@@ -58,18 +57,16 @@ public async Task SendUnidirectionalStreamTypeAsync(long streamType)
 await _stream.WriteAsync(buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
 }

 public async Task SendSettingsFrameAsync(ICollection<(long settingId, long settingValue)> settings = null)
 public async Task SendSettingsFrameAsync(SettingsEntry[] settingsEntries)
 {
 settings ??= Array.Empty<(long settingId, long settingValue)>();

 var buffer = new byte[settings.Count * MaximumVarIntBytes * 2];
 var buffer = new byte[settingsEntries.Length * MaximumVarIntBytes * 2];

 int bytesWritten = 0;

 foreach ((long settingId, long settingValue) in settings)
 foreach (SettingsEntry setting in settingsEntries)
 {
 bytesWritten += EncodeHttpInteger(settingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(settingValue, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger((int)setting.SettingId, buffer.AsSpan(bytesWritten));
 bytesWritten += EncodeHttpInteger(setting.Value, buffer.AsSpan(bytesWritten));
 }

 await SendFrameAsync(SettingsFrame, buffer.AsMemory(0, bytesWritten)).ConfigureAwait(false);
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/System.Net.Http/src/Resources/Strings.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,9 @@
 <data name="net_http_buffer_insufficient_length" xml:space="preserve">
 <value>The buffer was not long enough.</value>
 </data>
 <data name="net_http_request_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP request headers length exceeded the server limit of {0} bytes.</value>
 </data>
 <data name="net_http_response_headers_exceeded_length" xml:space="preserve">
 <value>The HTTP response headers length exceeded the set limit of {0} bytes.</value>
 </data>
Expand Down

63 changes: 54 additions & 9 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http2Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,10 @@ internal sealed partial class Http2Connection : HttpConnectionBase
 private readonly Channel<WriteQueueEntry> _writeChannel;
 private bool _lastPendingWriterShouldFlush;

 // Server-advertised SETTINGS_MAX_HEADER_LIST_SIZE
 // https://www.rfc-editor.org/rfc/rfc9113.html#section-6.5.2-2.12.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // This flag indicates that the connection is shutting down and cannot accept new requests, because of one of the following conditions:
 // (1) We received a GOAWAY frame from the server
 // (2) We have exhaustead StreamIds (i.e. _nextStream == MaxStreamId)
Expand DownExpand Up@@ -162,6 +166,14 @@ public Http2Connection(HttpConnectionPool pool, Stream stream)
 _nextPingRequestTimestamp = Environment.TickCount64 + _keepAlivePingDelay;
 _keepAlivePingPolicy = _pool.Settings._keepAlivePingPolicy;

 uint maxHeaderListSize = _pool._lastSeenHttp2MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
 HttpTelemetry.Log.Http20ConnectionEstablished();
Expand DownExpand Up@@ -822,6 +834,8 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 uint settingValue = BinaryPrimitives.ReadUInt32BigEndian(settings);
 settings = settings.Slice(4);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(SettingId)settingId}={settingValue}");

 switch ((SettingId)settingId)
 {
 case SettingId.MaxConcurrentStreams:
Expand DownExpand Up@@ -861,6 +875,11 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
 }
 break;

 case SettingId.MaxHeaderListSize:
 _maxHeaderListSize = settingValue;
 _pool._lastSeenHttp2MaxHeaderListSize = _maxHeaderListSize;
 break;

 default:
 // All others are ignored because we don't care about them.
 // Note, per RFC, unknown settings IDs should be ignored.
Expand DownExpand Up@@ -1379,14 +1398,18 @@ private void WriteBytes(ReadOnlySpan<byte> bytes, ref ArrayBuffer headerBuffer)
 headerBuffer.Commit(bytes.Length);
 }

 private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 private int WriteHeaderCollection(HttpRequestMessage request, HttpHeaders headers, ref ArrayBuffer headerBuffer)
 {
 if (NetEventSource.Log.IsEnabled()) Trace("");

 HeaderEncodingSelector<HttpRequestMessage>? encodingSelector = _pool.Settings._requestHeaderEncodingSelector;

 ref string[]? tmpHeaderValuesArray = ref t_headerValues;
 foreach (HeaderEntry header in headers.GetEntries())

 ReadOnlySpan<HeaderEntry> entries = headers.GetEntries();
 int headerListSize = entries.Length * HeaderField.RfcOverhead;

 foreach (HeaderEntry header in entries)
 {
 int headerValuesCount = HttpHeaders.GetStoreValuesIntoStringArray(header.Key, header.Value, ref tmpHeaderValuesArray);
 Debug.Assert(headerValuesCount > 0, "No values for header??");
Expand All@@ -1402,6 +1425,10 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 // The Connection, Upgrade and ProxyConnection headers are also not supported in HTTP2.
 if (knownHeader != KnownHeaders.Host && knownHeader != KnownHeaders.Connection && knownHeader != KnownHeaders.Upgrade && knownHeader != KnownHeaders.ProxyConnection)
 {
 // The length of the encoded name may be shorter than the actual name.
 // Ensure that headerListSize is always >= of the actual size.
 headerListSize += knownHeader.Name.Length;

 if (knownHeader == KnownHeaders.TE)
 {
 // HTTP/2 allows only 'trailers' TE header. rfc7540 8.1.2.2
Expand DownExpand Up@@ -1442,6 +1469,8 @@ private void WriteHeaderCollection(HttpRequestMessage request, HttpHeaders heade
 WriteLiteralHeader(header.Key.Name, headerValues, valueEncoding, ref headerBuffer);
 }
 }

 return headerListSize;
 }

 private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuffer)
Expand DownExpand Up@@ -1472,9 +1501,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

 WriteIndexedHeader(_pool.IsSecure ? H2StaticTable.SchemeHttps : H2StaticTable.SchemeHttp, ref headerBuffer);

 if (request.HasHeaders && request.Headers.Host != null)
 if (request.HasHeaders && request.Headers.Host is string host)
 {
 WriteIndexedHeader(H2StaticTable.Authority, request.Headers.Host, ref headerBuffer);
 WriteIndexedHeader(H2StaticTable.Authority, host, ref headerBuffer);
 }
 else
 {
Expand All@@ -1492,16 +1521,19 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 WriteIndexedHeader(H2StaticTable.PathSlash, pathAndQuery, ref headerBuffer);
 }

 int headerListSize = 3 * HeaderField.RfcOverhead; // Method, Authority, Path

 if (request.HasHeaders)
 {
 if (request.Headers.Protocol != null)
 {
 WriteBytes(ProtocolLiteralHeaderBytes, ref headerBuffer);
 Encoding? protocolEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(":protocol", request);
 WriteLiteralHeaderValue(request.Headers.Protocol, protocolEncoding, ref headerBuffer);
 headerListSize += HeaderField.RfcOverhead;
 }

 WriteHeaderCollection(request, request.Headers, ref headerBuffer);
headerListSize += WriteHeaderCollection(request, request.Headers, ref headerBuffer);
 }

 // Determine cookies to send.
Expand All@@ -1511,9 +1543,9 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 if (cookiesFromContainer != string.Empty)
 {
 WriteBytes(KnownHeaders.Cookie.Http2EncodedName, ref headerBuffer);

 Encoding? cookieEncoding = _pool.Settings._requestHeaderEncodingSelector?.Invoke(KnownHeaders.Cookie.Name, request);
 WriteLiteralHeaderValue(cookiesFromContainer, cookieEncoding, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.Cookie.Length + HeaderField.RfcOverhead;
 }
 }

Expand All@@ -1525,11 +1557,24 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff
 {
 WriteBytes(KnownHeaders.ContentLength.Http2EncodedName, ref headerBuffer);
 WriteLiteralHeaderValue("0", valueEncoding: null, ref headerBuffer);
 headerListSize += HttpKnownHeaderNames.ContentLength.Length + HeaderField.RfcOverhead;
 }
 }
 else
 {
 WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 headerListSize += WriteHeaderCollection(request, request.Content.Headers, ref headerBuffer);
 }

 // The headerListSize is an approximation of the total header length.
 // This is acceptable as long as the value is always >= the actual length.
 // We must avoid ever sending more than the server allowed.
 // This approach must be revisted if we ever support the dynamic table or compression when sending requests.
 headerListSize += headerBuffer.ActiveLength;

 uint maxHeaderListSize = _maxHeaderListSize;
 if ((uint)headerListSize > maxHeaderListSize)
 {
 throw new HttpRequestException(SR.Format(SR.net_http_request_headers_exceeded_length, maxHeaderListSize));
 }
 }

Expand DownExpand Up@@ -1602,10 +1647,10 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
 // streams are created and started in order.
 await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsExtendedConnectRequest), mustFlush), static (s, writeBuffer) =>
 {
 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 s.thisRef.AddStream(s.http2Stream);

 if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

 Span<byte> span = writeBuffer.Span;

 // Copy the HEADERS frame.
Expand Down

19 changes: 15 additions & 4 deletions
src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,9 @@ internal sealed class Http3Connection : HttpConnectionBase
 // Our control stream.
 private QuicStream? _clientControl;

 // Current SETTINGS from the server.
 private int _maximumHeadersLength = int.MaxValue; // TODO: this is not yet observed by Http3Stream when buffering headers.
 // Server-advertised SETTINGS_MAX_FIELD_SECTION_SIZE
 // https://www.rfc-editor.org/rfc/rfc9114.html#section-7.2.4.1-2.2.1
 private uint _maxHeaderListSize = uint.MaxValue; // Defaults to infinite

 // Once the server's streams are received, these are set to 1. Further receipt of these streams results in a connection error.
 private int _haveServerControlStream;
Expand All@@ -53,7 +54,7 @@ internal sealed class Http3Connection : HttpConnectionBase

 public HttpAuthority Authority => _authority;
 public HttpConnectionPool Pool => _pool;
 public int MaximumRequestHeadersLength => _maximumHeadersLength;
 public uint MaxHeaderListSize => _maxHeaderListSize;
 public byte[]? AltUsedEncodedHeaderBytes => _altUsedEncodedHeader;
 public Exception? AbortException => Volatile.Read(ref _abortException);
 private object SyncObj => _activeRequests;
Expand DownExpand Up@@ -84,6 +85,13 @@ public Http3Connection(HttpConnectionPool pool, HttpAuthority? origin, HttpAutho
 _altUsedEncodedHeader = QPack.QPackEncoder.EncodeLiteralHeaderFieldWithoutNameReferenceToArray(KnownHeaders.AltUsed.Name, altUsedValue);
 }

 uint maxHeaderListSize = _pool._lastSeenHttp3MaxHeaderListSize;
 if (maxHeaderListSize > 0)
 {
 // Previous connections to the same host advertised a limit.
 // Use this as an initial value before we receive the SETTINGS frame.
 _maxHeaderListSize = maxHeaderListSize;
 }

 if (HttpTelemetry.Log.IsEnabled())
 {
Expand DownExpand Up@@ -725,10 +733,13 @@ async ValueTask ProcessSettingsFrameAsync(long settingsPayloadLength)

 buffer.Discard(bytesRead);

 if (NetEventSource.Log.IsEnabled()) Trace($"Applying setting {(Http3SettingType)settingId}={settingValue}");

 switch ((Http3SettingType)settingId)
 {
 case Http3SettingType.MaxHeaderListSize:
 _maximumHeadersLength = (int)Math.Min(settingValue, int.MaxValue);
 _maxHeaderListSize = (uint)Math.Min((ulong)settingValue, uint.MaxValue);
 _pool._lastSeenHttp3MaxHeaderListSize = _maxHeaderListSize;
 break;
 case Http3SettingType.ReservedHttp2EnablePush:
 case Http3SettingType.ReservedHttp2MaxConcurrentStreams:
Expand Down
Loading