Skip to content

Defer RemoteCertificate assignment after X509 Chain build #114781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2025
Merged

Defer RemoteCertificate assignment after X509 Chain build #114781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3431086
Defer RemoteCertificate assignment after X509 Chain build
rzikm Apr 17, 2025
a213c08
Add comment
rzikm Apr 17, 2025
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
11 changes: 7 additions & 4 deletions src/libraries/System.Net.Security/src/System/Net/Security/SslStream.Protocol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,8 +1056,9 @@ internal bool VerifyRemoteCertificate(RemoteCertificateValidationCallback? remot
return true;
}

_remoteCertificate = certificate;
if (_remoteCertificate == null)
// don't assign to _remoteCertificate yet, this prevents weird exceptions if SslStream is disposed in parallel with X509Chain building

if (certificate == null)
{
if (NetEventSource.Log.IsEnabled() && RemoteCertRequired) NetEventSource.Error(this, $"Remote certificate required, but no remote certificate received");
sslPolicyErrors |= SslPolicyErrors.RemoteCertificateNotAvailable;
Expand Down Expand Up @@ -1099,15 +1100,17 @@ internal bool VerifyRemoteCertificate(RemoteCertificateValidationCallback? remot
sslPolicyErrors |= CertificateValidationPal.VerifyCertificateProperties(
_securityContext!,
chain,
_remoteCertificate,
certificate,
_sslAuthenticationOptions.CheckCertName,
_sslAuthenticationOptions.IsServer,
TargetHostNameHelper.NormalizeHostName(_sslAuthenticationOptions.TargetHost));
}

_remoteCertificate = certificate;

if (remoteCertValidationCallback != null)
{
success = remoteCertValidationCallback(this, _remoteCertificate, chain, sslPolicyErrors);
success = remoteCertValidationCallback(this, certificate, chain, sslPolicyErrors);
}
else
{
Expand Down
Loading