Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
30da832
downgrade proposal for HttpClient
May 24, 2022
7b03bc8
HttpClient to handle ws over h2
Jun 7, 2022
e7b8332
ClientWebSocket to handle ws over h2
Jun 7, 2022
a5e991a
Add property for protocol header and remove it from known headers
Jun 17, 2022
264c802
Update src/libraries/System.Net.Http/src/System/Net/Http/HttpRequestM…
Jun 18, 2022
08d1f8c
Address review feedback
Jun 18, 2022
71cc887
Rename HttpVersion and HttpVersionPolicy
Jun 20, 2022
8019a3c
Apply suggestions from code review
Jun 21, 2022
8ef8b4c
address review feedback
Jun 21, 2022
ac966a8
Merge branch 'main' into ws-h2-draft
Jun 23, 2022
f6de72a
address review feedback
Jun 24, 2022
9221483
address review feedback
Jun 28, 2022
fafc84b
Apply suggestions from code review
Jun 28, 2022
0d8f8f7
fix race condition on setting enable connect
Jun 29, 2022
9be5b95
inherit h2 read and writes streams
Jun 29, 2022
502b051
Apply suggestions from code review
Jun 30, 2022
e635439
fix H2PACK encoding issue
Jun 30, 2022
ad66857
add timeout for waiting settings task
Jun 30, 2022
c58d993
generalized settings received task
Jun 30, 2022
76c9e20
Update src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpH…
Jul 1, 2022
2467449
Fixing HttpStream tests
Jul 1, 2022
d9248a6
Apply suggestions from code review
Jul 4, 2022
baf52d4
address review feedback
Jul 4, 2022
afaf5be
Apply suggestions from code review
Jul 8, 2022
918c6a8
Address review feedback
Jul 8, 2022
9734075
Adapt test to ValueTask.FromException
Jul 8, 2022
efdcdba
Apply suggestions from code review
Jul 10, 2022
6f7b101
Adding connect tests
Jul 10, 2022
595642c
Apply suggestions from code review
Jul 10, 2022
e05db11
feedback + skip tests on browser
Jul 10, 2022
54d0b08
Merge branch 'main' into ws-h2-draft
Jul 10, 2022
b7f543b
Feedback + test for websocket stream
Jul 12, 2022
73968ec
Update src/libraries/System.Net.Http/src/Resources/Strings.resx
Jul 12, 2022
4dbe1c2
Address review feedback
Jul 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/libraries/Common/tests/System/Net/Http/Http2Frames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public enum SettingId : ushort
MaxConcurrentStreams = 0x3,
InitialWindowSize = 0x4,
MaxFrameSize = 0x5,
MaxHeaderListSize = 0x6
MaxHeaderListSize = 0x6,
EnableConnect = 0x8
}

public class Frame
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ public override Uri Address
localEndPoint.Address.ToString();

string scheme = _options.UseSsl ? "https" : "http";
if (_options.WebSocketEndpoint)
{
scheme = _options.UseSsl ? "wss" : "ws";
}

_uri = new Uri($"{scheme}://{host}:{localEndPoint.Port}/");

Expand Down Expand Up @@ -177,6 +181,7 @@ public static async Task CreateClientAndServerAsync(Func<Uri, Task> clientFunc,

public class Http2Options : GenericLoopbackOptions
{
public bool WebSocketEndpoint { get; set; } = false;
public bool ClientCertificateRequired { get; set; }

public bool EnableTransparentPingResponse { get; set; } = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
Assert.Equal(PlatformDetection.IsBrowser && !enableWasmStreaming, responseStream.CanSeek);

// Not supported operations
Assert.Throws<NotSupportedException>(() => responseStream.BeginWrite(new byte[1], 0, 1, null, null));
await Assert.ThrowsAsync<NotSupportedException>(async () => await Task.Factory.FromAsync(responseStream.BeginWrite, responseStream.EndWrite, new byte[1], 0, 1, null));
if (!responseStream.CanSeek)
{
Assert.Throws<NotSupportedException>(() => responseStream.Length);
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Net.Http/ref/System.Net.Http.cs
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ public HttpMethod(string method) { }
public static System.Net.Http.HttpMethod Post { get { throw null; } }
public static System.Net.Http.HttpMethod Put { get { throw null; } }
public static System.Net.Http.HttpMethod Trace { get { throw null; } }
public static System.Net.Http.HttpMethod Connect { get { throw null; } }
public bool Equals([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] System.Net.Http.HttpMethod? other) { throw null; }
public override bool Equals([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] object? obj) { throw null; }
public override int GetHashCode() { throw null; }
Expand Down Expand Up @@ -661,6 +662,7 @@ internal HttpRequestHeaders() { }
public System.DateTimeOffset? IfUnmodifiedSince { get { throw null; } set { } }
public int? MaxForwards { get { throw null; } set { } }
public System.Net.Http.Headers.HttpHeaderValueCollection<System.Net.Http.Headers.NameValueHeaderValue> Pragma { get { throw null; } }
public string? Protocol { get { throw null; } set { } }
public System.Net.Http.Headers.AuthenticationHeaderValue? ProxyAuthorization { get { throw null; } set { } }
public System.Net.Http.Headers.RangeHeaderValue? Range { get { throw null; } set { } }
public System.Uri? Referrer { get { throw null; } set { } }
Expand Down
8 changes: 7 additions & 1 deletion src/libraries/System.Net.Http/src/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@
<data name="net_http_content_readonly_stream" xml:space="preserve">
<value>The stream does not support writing.</value>
</data>
<data name="net_http_content_writeonly_stream" xml:space="preserve">
<value>The stream does not support reading.</value>
</data>
<data name="net_http_content_invalid_charset" xml:space="preserve">
<value>The character set provided in ContentType is invalid. Cannot read content as string using an invalid character set.</value>
</data>
Expand Down Expand Up @@ -564,4 +567,7 @@
<data name="net_http_chunk_too_large" xml:space="preserve">
<value>The HTTP/1.1 response chunk was too large.</value>
</data>
</root>
<data name="net_unsupported_extended_connect" xml:space="preserve">
<value>Failed to establish web socket connection over HTTP/2 because extended CONNECT is not supported. Try to downgrade the request version to HTTP/1.1.</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public sealed class HttpRequestHeaders : HttpHeaders
private HttpGeneralHeaders? _generalHeaders;
private HttpHeaderValueCollection<NameValueWithParametersHeaderValue>? _expect;
private bool _expectContinueSet;
private string? _protocol;

#region Request Headers

Expand Down Expand Up @@ -159,6 +160,15 @@ public int? MaxForwards
set { SetOrRemoveParsedValue(KnownHeaders.MaxForwards.Descriptor, value); }
}

public string? Protocol
{
get => _protocol;
set
{
CheckContainsNewLine(value);
_protocol = value;
}
}

public AuthenticationHeaderValue? ProxyAuthorization
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static HttpMethod Patch
// Don't expose CONNECT as static property, since it's used by the transport to connect to a proxy.
// CONNECT is not used by users directly.

internal static HttpMethod Connect
public static HttpMethod Connect
{
get { return s_connectMethod; }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ public override string ToString()

internal bool WasRedirected() => (_sendStatus & MessageIsRedirect) != 0;

internal bool IsWebSocketH2Request() => _version.Major == 2 && Method == HttpMethod.Connect && HasHeaders && string.Equals(Headers.Protocol, "websocket", StringComparison.OrdinalIgnoreCase);

#region IDisposable Members

protected virtual void Dispose(bool disposing)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.IO;
using System.Net.Http.Headers;
using System.Net.Http.HPack;
using System.Net.Security;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
Expand All @@ -19,6 +18,13 @@ namespace System.Net.Http
{
internal sealed partial class Http2Connection : HttpConnectionBase
{
// Equivalent to the bytes returned from HPackEncoder.EncodeLiteralHeaderFieldWithoutIndexingNewNameToAllocatedArray(":protocol")
private static ReadOnlySpan<byte> ProtocolLiteralHeaderBytes => new byte[] { 0x0, 0x9, 0x3a, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c };

private static readonly TaskCompletionSourceWithCancellation<bool> s_settingsReceivedSingleton = CreateSuccessfullyCompletedTcs();

private TaskCompletionSourceWithCancellation<bool>? _initialSettingsReceived;

private readonly HttpConnectionPool _pool;
private readonly Stream _stream;

Expand Down Expand Up @@ -174,6 +180,13 @@ static long TimeSpanToMs(TimeSpan value) {

private object SyncObject => _httpStreams;

internal TaskCompletionSourceWithCancellation<bool> InitialSettingsReceived =>
_initialSettingsReceived ??
Interlocked.CompareExchange(ref _initialSettingsReceived, new(), null) ??
_initialSettingsReceived;

internal bool IsConnectEnabled { get; private set; }

public async ValueTask SetupAsync(CancellationToken cancellationToken)
{
try
Expand Down Expand Up @@ -832,17 +845,41 @@ private void ProcessSettingsFrame(FrameHeader frameHeader, bool initialFrame = f
// We don't actually store this value; we always send frames of the minimum size (16K).
break;

case SettingId.EnableConnect:
if (settingValue == 1)
{
IsConnectEnabled = true;
}
else if (settingValue == 0 && IsConnectEnabled)
{
// Accroding to RFC: a sender MUST NOT send a SETTINGS_ENABLE_CONNECT_PROTOCOL parameter
// with the value of 0 after previously sending a value of 1.
// https://datatracker.ietf.org/doc/html/rfc8441#section-3
ThrowProtocolError();
}
break;

default:
// All others are ignored because we don't care about them.
// Note, per RFC, unknown settings IDs should be ignored.
break;
}
}

if (initialFrame && !maxConcurrentStreamsReceived)
if (initialFrame)
{
// Set to 'infinite' because MaxConcurrentStreams was not set on the initial SETTINGS frame.
ChangeMaxConcurrentStreams(int.MaxValue);
if (!maxConcurrentStreamsReceived)
{
// Set to 'infinite' because MaxConcurrentStreams was not set on the initial SETTINGS frame.
ChangeMaxConcurrentStreams(int.MaxValue);
}

if (_initialSettingsReceived is null)
{
Interlocked.CompareExchange(ref _initialSettingsReceived, s_settingsReceivedSingleton, null);
}
// Set result in case if CompareExchange lost the race
InitialSettingsReceived.TrySetResult(true);
}

_incomingBuffer.Discard(frameHeader.PayloadLength);
Expand Down Expand Up @@ -1455,6 +1492,13 @@ private void WriteHeaders(HttpRequestMessage request, ref ArrayBuffer headerBuff

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);
}

WriteHeaderCollection(request, request.Headers, ref headerBuffer);
}

Expand Down Expand Up @@ -1895,7 +1939,15 @@ private enum SettingId : ushort
MaxConcurrentStreams = 0x3,
InitialWindowSize = 0x4,
MaxFrameSize = 0x5,
MaxHeaderListSize = 0x6
MaxHeaderListSize = 0x6,
EnableConnect = 0x8
}

private static TaskCompletionSourceWithCancellation<bool> CreateSuccessfullyCompletedTcs()
{
var tcs = new TaskCompletionSourceWithCancellation<bool>();
tcs.TrySetResult(true);
return tcs;
}

// Note that this is safe to be called concurrently by multiple threads.
Expand Down
Loading