Skip to content

[PoC] surface Quic transport errors#87679

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

Closed
wfurt wants to merge 3 commits into from
Closed

[PoC] surface Quic transport errors #87679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d39f8b6
surface Quic transport errors
wfurt Jun 16, 2023
3f32d74
cleanup
wfurt Jun 16, 2023
d81bf41
AssertThrowsQuicExceptionAsync
wfurt Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
ProtocolError = 11,
OperationAborted = 12,
AlpnInUse = 13,
TransportError = 14,
}
public sealed partial class QuicException : System.IO.IOException
{
public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
public long? ApplicationErrorCode { get { throw null; } }
public System.Net.Quic.QuicError QuicError { get { throw null; } }
public long? TransportErrorCode { get { throw null; } }
}
public sealed partial class QuicListener : System.IAsyncDisposable
{
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Quic/src/Resources/Strings.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
<data name="net_quic_protocol_error" xml:space="preserve">
<value>A QUIC protocol error was encountered</value>
</data>
<data name="net_quic_transport_error" xml:space="preserve">
<value>QUIC encountered transport error '{0}'</value>
</data>
<data name="net_quic_alpn_in_use" xml:space="preserve">
<value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
</data>
Expand Down
13 changes: 10 additions & 3 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
return false;
}

internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
{
Exception ex = GetExceptionInternal(status, message);
Exception ex = GetExceptionInternal(status, message, transportErrorCode);
if (status != 0)
{
// Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

return ex;

static Exception GetExceptionInternal(int status, string? message)
static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
{
//
// Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
// Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
//
if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

// should we remove this and surface as TransportError ????
if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

//
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
}

if (transportErrorCode != null)
{
return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
}

//
// for everything else, use general InternalError
//
Expand Down
4 changes: 1 addition & 3 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
}
private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
{
// TODO: we should propagate transport error code.
// https://github.com/dotnet/runtime/issues/72666
Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
_connectedTcs.TrySetException(exception);
_acceptQueue.Writer.TryComplete(exception);
return QUIC_STATUS_SUCCESS;
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
/// Another QUIC listener is already listening on one of the requested application protocols on the same port.
/// </summary>
AlpnInUse,

/// <summary>
/// Quic operation failed because of Quic transport error.
/// </summary>
TransportError,
}
}
13 changes: 13 additions & 0 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
ApplicationErrorCode = applicationErrorCode;
}

internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
: base(message, innerException)
{
QuicError = error;
ApplicationErrorCode = applicationErrorCode;
TransportErrorCode = transportErrorCode;
}

/// <summary>
/// Gets the error which is associated with this exception.
/// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
/// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
/// </remarks>
public long? ApplicationErrorCode { get; }

/// <summary>
/// The transport error code as described in Quic RFC.
/// </summary>
public long? TransportErrorCode { get; }
}
}
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
[Fact]
public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
{
await Assert.ThrowsAsync<QuicException>(() => TestConnection(
await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
));
}
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[PoC] surface Quic transport errors by wfurt · Pull Request #87679 · dotnet/runtime · GitHub
Skip to content
[PoC] surface Quic transport errors#87679

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

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

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

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

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

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

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

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

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[PoC] surface Quic transport errors by wfurt · Pull Request #87679 · dotnet/runtime · GitHub
Skip to content
[PoC] surface Quic transport errors#87679

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}

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

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

 Closed

wfurt
wants to merge
3
commits into

from

 Closed


[PoC] surface Quic transport errors
#87679
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
d39f8b6

surface Quic transport errors


wfurt Jun 16, 2023
3f32d74

cleanup


wfurt Jun 16, 2023
d81bf41

AssertThrowsQuicExceptionAsync


wfurt Jun 19, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Quic/ref/System.Net.Quic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,12 +61,14 @@ public enum QuicError
 ProtocolError = 11,
 OperationAborted = 12,
 AlpnInUse = 13,
 TransportError = 14,
 }
 public sealed partial class QuicException : System.IO.IOException
 {
 public QuicException(System.Net.Quic.QuicError error, long? applicationErrorCode, string message) { }
 public long? ApplicationErrorCode { get { throw null; } }
 public System.Net.Quic.QuicError QuicError { get { throw null; } }
 public long? TransportErrorCode { get { throw null; } }
 }
 public sealed partial class QuicListener : System.IAsyncDisposable
 {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,9 @@
 <data name="net_quic_protocol_error" xml:space="preserve">
 <value>A QUIC protocol error was encountered</value>
 </data>
 <data name="net_quic_transport_error" xml:space="preserve">
 <value>QUIC encountered transport error '{0}'</value>
 </data>
 <data name="net_quic_alpn_in_use" xml:space="preserve">
 <value>Another QUIC listener is already listening on one of the requested application protocols on the same port.</value>
 </data>
Expand Down

13 changes: 10 additions & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/ThrowHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,9 +49,9 @@ internal static bool TryGetStreamExceptionForMsQuicStatus(int status, [NotNullWh
 return false;
 }

 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null)
 internal static Exception GetExceptionForMsQuicStatus(int status, string? message = null, long? transportErrorCode = null)
 {
 Exception ex = GetExceptionInternal(status, message);
 Exception ex = GetExceptionInternal(status, message, transportErrorCode);
 if (status != 0)
 {
 // Include the raw MsQuic status in the HResult property for better diagnostics
Expand All@@ -60,7 +60,7 @@ internal static Exception GetExceptionForMsQuicStatus(int status, string? messag

 return ex;

 static Exception GetExceptionInternal(int status, string? message)
 static Exception GetExceptionInternal(int status, string? message, long? transportErrorCode)
 {
 //
 // Start by checking for statuses mapped to QuicError enum
Expand All@@ -87,6 +87,8 @@ static Exception GetExceptionInternal(int status, string? message)
 // Some TLS Alerts are mapped to dedicated QUIC_STATUS codes so we need to handle them individually.
 //
 if (status == QUIC_STATUS_ALPN_NEG_FAILURE) return new AuthenticationException(SR.net_quic_alpn_neg_error);

 // should we remove this and surface as TransportError ????
 if (status == QUIC_STATUS_USER_CANCELED) return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, TlsAlertMessage.UserCanceled));

 //
Expand All@@ -110,6 +112,11 @@ static Exception GetExceptionInternal(int status, string? message)
 return new AuthenticationException(SR.Format(SR.net_auth_tls_alert, alert));
 }

 if (transportErrorCode != null)
 {
 return new QuicException(QuicError.TransportError, null, transportErrorCode, SR.Format(SR.net_quic_transport_error, transportErrorCode), null);
 }

 //
 // for everything else, use general InternalError
 //
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -479,9 +479,7 @@ private unsafe int HandleEventConnected(ref CONNECTED_DATA data)
 }
 private unsafe int HandleEventShutdownInitiatedByTransport(ref SHUTDOWN_INITIATED_BY_TRANSPORT_DATA data)
 {
 // TODO: we should propagate transport error code.
 // https://github.com/dotnet/runtime/issues/72666
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status));
 Exception exception = ExceptionDispatchInfo.SetCurrentStackTrace(ThrowHelper.GetExceptionForMsQuicStatus(data.Status, null, (long)data.ErrorCode));
 _connectedTcs.TrySetException(exception);
 _acceptQueue.Writer.TryComplete(exception);
 return QUIC_STATUS_SUCCESS;
Expand Down

5 changes: 5 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicError.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,5 +77,10 @@ public enum QuicError
 /// Another QUIC listener is already listening on one of the requested application protocols on the same port.
 /// </summary>
 AlpnInUse,

 /// <summary>
 /// Quic operation failed because of Quic transport error.
 /// </summary>
 TransportError,
 }
}

13 changes: 13 additions & 0 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/QuicException.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,14 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 ApplicationErrorCode = applicationErrorCode;
 }

 internal QuicException(QuicError error, long? applicationErrorCode, long? transportErrorCode, string message, Exception? innerException)
 : base(message, innerException)
 {
 QuicError = error;
 ApplicationErrorCode = applicationErrorCode;
 TransportErrorCode = transportErrorCode;
 }

 /// <summary>
 /// Gets the error which is associated with this exception.
 /// </summary>
Expand All@@ -46,5 +54,10 @@ internal QuicException(QuicError error, long? applicationErrorCode, string messa
 /// This property contains the error code set by the application layer when closing the connection (<see cref="QuicError.ConnectionAborted"/>) or closing a read/write direction of a QUIC stream (<see cref="QuicError.StreamAborted"/>). Contains null for all other errors.
 /// </remarks>
 public long? ApplicationErrorCode { get; }

 /// <summary>
 /// The transport error code as described in Quic RFC.
 /// </summary>
 public long? TransportErrorCode { get; }
 }
}

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicCipherSuitesPolicyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,10 +71,10 @@ public void NoSupportedCiphers_ThrowsArgumentException(TlsCipherSuite[] ciphers)
 [Fact]
 public async Task MismatchedCipherPolicies_ConnectAsync_ThrowsQuicException()
 {
 await Assert.ThrowsAsync<QuicException>(() => TestConnection(
 await AssertThrowsQuicExceptionAsync(QuicError.TransportError, () => TestConnection(
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_128_GCM_SHA256 }),
 new CipherSuitesPolicy(new[] { TlsCipherSuite.TLS_AES_256_GCM_SHA384 })
 ));
 }
 }
}
}