support ServerCertificateContext in quic#53175

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
wfurt merged 1 commit into from
May 31, 2021
Merged

support ServerCertificateContext in quic #53175

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
43 changes: 38 additions & 5 deletions ....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
{
private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

public override bool IsInvalid => handle == IntPtr.Zero;

private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
{
// TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
}

public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
{
// TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
}

// TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
// Consider moving bigger logic like this outside of constructor call chains.
private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
{
// TODO: some of these checks should be done by the QuicOptions type.
if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
{
if (certificate == null)
if (certificate == null && certificateContext == null)
{
throw new Exception("Server must provide certificate");
}
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

uint status;
SafeMsQuicConfigurationHandle? configurationHandle;
X509Certificate2[]? intermediates = null;

MemoryHandle[]? handles = null;
QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
CredentialConfig config = default;
config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

if (certificateContext != null)
{
certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);

@scalablecoryscalablecoryMay 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?

intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

if (certificate == null || intermediates == null)
{
throw new ArgumentException(nameof(certificateContext));
}
}

if (certificate != null)
{
if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
else
{
CredentialConfigCertificatePkcs12 pkcs12Config;
byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
byte[] asn1;

if (intermediates?.Length > 0)
{
X509Certificate2Collection collection = new X509Certificate2Collection();
collection.Add(certificate);
for (int i= 0; i < intermediates?.Length; i++)
{
collection.Add(intermediates[i]);
}

asn1 = collection.Export(X509ContentType.Pkcs12)!;
}
else
{
asn1 = certificate.Export(X509ContentType.Pkcs12);
}

fixed (void* ptr = asn1)
{
pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
additionalCertificates.Import(asn1);
if (additionalCertificates.Count > 0)
{
certificate = additionalCertificates[0];
certificate = additionalCertificates[additionalCertificates.Count - 1];
}
}
}
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

if (additionalCertificates != null && additionalCertificates.Count > 1)
{
for (int i = 1; i < additionalCertificates.Count; i++)
for (int i = 0; i < additionalCertificates.Count - 1; i++)
{
chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
}
Expand Down
42 changes: 42 additions & 0 deletions src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
}

[Fact]
public async Task ConnectWithCertificateChain()
{
(X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
X509Certificate2 rootCA = chain[chain.Count - 1];

var quicOptions = new QuicListenerOptions();
quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

QuicClientConnectionOptions options = new QuicClientConnectionOptions()
{
RemoteEndPoint = listener.ListenEndPoint,
ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
};

options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
{
Assert.Equal(certificate.Subject, cert.Subject);
Assert.Equal(certificate.Issuer, cert.Issuer);
// We should get full chain without root CA.
// With trusted root, we should be able to build chain.
chain.ChainPolicy.CustomTrustStore.Add(rootCA);
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
Assert.True(chain.Build(certificate));

return true;
};

using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
ValueTask clientTask = clientConnection.ConnectAsync();

using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
await clientTask;
}

[Fact]
[OuterLoop("May take several seconds")]
public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down
14 changes: 11 additions & 3 deletions src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
<Compile Include="*.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
<Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
<Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
<Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
<Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
<Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
<Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
<Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down
, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down

, '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
support ServerCertificateContext in quic#53175

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

wfurt
merged 1 commit into

from

May 31, 2021
 Merged


support ServerCertificateContext in quic
#53175
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


43 changes: 38 additions & 5 deletions
....Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/SafeMsQuicConfigurationHandle.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Security;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using System.Text;
Expand All@@ -15,6 +16,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
 internal sealed class SafeMsQuicConfigurationHandle : SafeHandle
 {
 private static readonly FieldInfo _contextCertificate = typeof(SslStreamCertificateContext).GetField("Certificate", BindingFlags.NonPublic | BindingFlags.Instance)!;
 private static readonly FieldInfo _contextChain= typeof(SslStreamCertificateContext).GetField("IntermediateCertificates", BindingFlags.NonPublic | BindingFlags.Instance)!;

 public override bool IsInvalid => handle == IntPtr.Zero;

 private SafeMsQuicConfigurationHandle()
Expand All@@ -31,18 +35,18 @@ protected override bool ReleaseHandle()
 public static unsafe SafeMsQuicConfigurationHandle Create(QuicClientConnectionOptions options)
 {
 // TODO: lots of ClientAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.CLIENT, certificate: null, certificateContext: null, options.ClientAuthenticationOptions?.ApplicationProtocols);
 }

 public static unsafe SafeMsQuicConfigurationHandle Create(QuicListenerOptions options)
 {
 // TODO: lots of ServerAuthenticationOptions are not yet supported by MsQuic.
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ApplicationProtocols);
 return Create(options, QUIC_CREDENTIAL_FLAGS.NONE, options.ServerAuthenticationOptions?.ServerCertificate, options.ServerAuthenticationOptions?.ServerCertificateContext, options.ServerAuthenticationOptions?.ApplicationProtocols);
 }

 // TODO: this is called from MsQuicListener and when it fails it wreaks havoc in MsQuicListener finalizer.
 // Consider moving bigger logic like this outside of constructor call chains.
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, List<SslApplicationProtocol>? alpnProtocols)
 private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options, QUIC_CREDENTIAL_FLAGS flags, X509Certificate? certificate, SslStreamCertificateContext? certificateContext, List<SslApplicationProtocol>? alpnProtocols)
 {
 // TODO: some of these checks should be done by the QuicOptions type.
 if (alpnProtocols == null || alpnProtocols.Count == 0)
Expand All@@ -62,7 +66,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 if ((flags & QUIC_CREDENTIAL_FLAGS.CLIENT) == 0)
 {
 if (certificate == null)
 if (certificate == null && certificateContext == null)
 {
 throw new Exception("Server must provide certificate");
 }
Expand DownExpand Up@@ -101,6 +105,7 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,

 uint status;
 SafeMsQuicConfigurationHandle? configurationHandle;
 X509Certificate2[]? intermediates = null;

 MemoryHandle[]? handles = null;
 QuicBuffer[]? buffers = null;
Expand All@@ -121,6 +126,17 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 CredentialConfig config = default;
 config.Flags = flags; // TODO: consider using LOAD_ASYNCHRONOUS with a callback.

 if (certificateContext != null)
 {
 certificate = (X509Certificate2?) _contextCertificate.GetValue(certificateContext);
@scalablecoryscalablecoryMay 25, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it valid for certificate to be reassigned here? if not, can we have some checks (maybe just asserts) to verify it was null?
 intermediates = (X509Certificate2[]?) _contextChain.GetValue(certificateContext);

 if (certificate == null || intermediates == null)
 {
 throw new ArgumentException(nameof(certificateContext));
 }
 }

 if (certificate != null)
 {
 if (OperatingSystem.IsWindows())
Expand All@@ -132,7 +148,24 @@ private static unsafe SafeMsQuicConfigurationHandle Create(QuicOptions options,
 else
 {
 CredentialConfigCertificatePkcs12 pkcs12Config;
 byte[] asn1 = certificate.Export(X509ContentType.Pkcs12);
 byte[] asn1;

 if (intermediates?.Length > 0)
 {
 X509Certificate2Collection collection = new X509Certificate2Collection();
 collection.Add(certificate);
 for (int i= 0; i < intermediates?.Length; i++)
 {
 collection.Add(intermediates[i]);
 }

 asn1 = collection.Export(X509ContentType.Pkcs12)!;
 }
 else
 {
 asn1 = certificate.Export(X509ContentType.Pkcs12);
 }

 fixed (void* ptr = asn1)
 {
 pkcs12Config.Asn1Blob = (IntPtr)ptr;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti
 additionalCertificates.Import(asn1);
 if (additionalCertificates.Count > 0)
 {
 certificate = additionalCertificates[0];
 certificate = additionalCertificates[additionalCertificates.Count - 1];
 }
 }
 }
Expand DownExpand Up@@ -263,7 +263,7 @@ private static uint HandleEventPeerCertificateReceived(State state, ref Connecti

 if (additionalCertificates != null && additionalCertificates.Count > 1)
 {
 for (int i = 1; i < additionalCertificates.Count; i++)
 for (int i = 0; i < additionalCertificates.Count - 1; i++)
 {
 chain.ChainPolicy.ExtraStore.Add(additionalCertificates[i]);
 }
Expand Down

42 changes: 42 additions & 0 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using Xunit;
Expand DownExpand Up@@ -53,6 +55,46 @@ public async Task UnidirectionalAndBidirectionalChangeValues()
 Assert.Equal(20, serverConnection.GetRemoteAvailableUnidirectionalStreamCount());
 }

 [Fact]
 public async Task ConnectWithCertificateChain()
 {
 (X509Certificate2 certificate, X509Certificate2Collection chain) = System.Net.Security.Tests.TestHelper.GenerateCertificates("localhost", longChain: true);
 X509Certificate2 rootCA = chain[chain.Count - 1];

 var quicOptions = new QuicListenerOptions();
 quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
 quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions();
 quicOptions.ServerAuthenticationOptions.ServerCertificateContext = SslStreamCertificateContext.Create(certificate, chain);
 quicOptions.ServerAuthenticationOptions.ServerCertificate = null;

 using QuicListener listener = new QuicListener(QuicImplementationProviders.MsQuic, quicOptions);

 QuicClientConnectionOptions options = new QuicClientConnectionOptions()
 {
 RemoteEndPoint = listener.ListenEndPoint,
 ClientAuthenticationOptions = GetSslClientAuthenticationOptions(),
 };

 options.ClientAuthenticationOptions.RemoteCertificateValidationCallback = (sender, cert, chain, errors) =>
 {
 Assert.Equal(certificate.Subject, cert.Subject);
 Assert.Equal(certificate.Issuer, cert.Issuer);
 // We should get full chain without root CA.
 // With trusted root, we should be able to build chain.
 chain.ChainPolicy.CustomTrustStore.Add(rootCA);
 chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
 Assert.True(chain.Build(certificate));

 return true;
 };

 using QuicConnection clientConnection = new QuicConnection(QuicImplementationProviders.MsQuic, options);
 ValueTask clientTask = clientConnection.ConnectAsync();

 using QuicConnection serverConnection = await listener.AcceptConnectionAsync();
 await clientTask;
 }

 [Fact]
 [OuterLoop("May take several seconds")]
 public async Task SetListenerTimeoutWorksWithSmallTimeout()
Expand Down

14 changes: 11 additions & 3 deletions
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,21 @@
 <Compile Include="*.cs" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs" Link="ProductionCode\Common\System\Net\ArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />
 <Compile Include="$(CommonTestPath)System\IO\ConnectedStreams.cs" Link="Common\System\IO\ConnectedStreams.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" Link="Common\System\Net\Capability.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs" Link="TestCommon\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\..\..\System.Net.Security\tests\FunctionalTests\TestHelper.cs" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="$(CommonTestPath)StreamConformanceTests\StreamConformanceTests.csproj" />
Expand Down