Skip to content

Use SslServerAuthenticationOptions where available #628

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use SslServerAuthenticationOptions where available #628

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
27 changes: 22 additions & 5 deletions source/Halibut/Transport/SecureListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ public class SecureListener : IAsyncDisposable
static extern bool SetHandleInformation(IntPtr hObject, HANDLE_FLAGS dwMask, HANDLE_FLAGS dwFlags);

readonly IPEndPoint endPoint;
#if !NET5_0_OR_GREATER
readonly X509Certificate2 serverCertificate;
#else
readonly SslServerAuthenticationOptions authenticationOptions;
#endif
readonly ExchangeProtocolBuilder exchangeProtocolBuilder;
readonly Predicate<string> verifyClientThumbprint;
readonly Func<string, string, UnauthorizedClientConnectResponse> unauthorizedClientConnect;
Expand Down Expand Up @@ -70,7 +74,20 @@ public SecureListener(
IConnectionsObserver connectionsObserver)
{
this.endPoint = endPoint;

#if !NET5_0_OR_GREATER
this.serverCertificate = serverCertificate;
#else
var certificateContext = SslStreamCertificateContext.Create(serverCertificate, null);
authenticationOptions = new SslServerAuthenticationOptions
{
ServerCertificateContext = certificateContext,
ClientCertificateRequired = true,
EnabledSslProtocols = SslConfiguration.SupportedProtocols,
CertificateRevocationCheckMode = X509RevocationMode.NoCheck
};
#endif

this.exchangeProtocolBuilder = exchangeProtocolBuilder;
this.exchangeAction = exchangeAction;
this.verifyClientThumbprint = verifyClientThumbprint;
Expand Down Expand Up @@ -299,11 +316,11 @@ async Task ExecuteRequest(TcpClient client)
log.Write(EventType.SecurityNegotiation, "Performing TLS server handshake");

await ssl
.AuthenticateAsServerAsync(
serverCertificate,
true,
SslConfiguration.SupportedProtocols,
false)
#if !NET5_0_OR_GREATER
.AuthenticateAsServerAsync(serverCertificate, true, SslConfiguration.SupportedProtocols, false)
#else
.AuthenticateAsServerAsync(authenticationOptions, cancellationToken)
#endif
.ConfigureAwait(false);

log.Write(EventType.SecurityNegotiation, "Secure connection established, client is not yet authenticated, client connected with {0}", ssl.SslProtocol.ToString());
Expand Down