Skip to content

Added option to specify ClientCertificateContext in .NET 8+ #1866

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −0
Open

Added option to specify ClientCertificateContext in .NET 8+ #1866

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
7 changes: 7 additions & 0 deletions projects/RabbitMQ.Client/Impl/SslHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ Task TryAuthenticating(SslOption opts)
EnabledSslProtocols = opts.Version,
TargetHost = opts.ServerName,
};

#if NET8_0_OR_GREATER
if (opts.ClientCertificateContext != null)
{
o.ClientCertificateContext = opts.ClientCertificateContext;
}
#endif
return sslStream.AuthenticateAsClientAsync(o, cancellationToken);
#else
return sslStream.AuthenticateAsClientAsync(opts.ServerName, opts.Certs, opts.Version, opts.CheckCertificateRevocation);
Expand Down
18 changes: 18 additions & 0 deletions projects/RabbitMQ.Client/PublicAPI/PublicAPI.Unshipped.net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
RabbitMQ.Client.Exceptions.PublishException.PublishException(ulong publishSequenceNumber, bool isReturn, string! message) -> void
RabbitMQ.Client.Exceptions.PublishReturnException
RabbitMQ.Client.Exceptions.PublishReturnException.Exchange.get -> string!
RabbitMQ.Client.Exceptions.PublishReturnException.PublishReturnException(ulong publishSequenceNumber, string! message, string? exchange = null, string? routingKey = null, ushort? replyCode = null, string? replyText = null) -> void
RabbitMQ.Client.Exceptions.PublishReturnException.ReplyCode.get -> ushort
RabbitMQ.Client.Exceptions.PublishReturnException.ReplyText.get -> string!
RabbitMQ.Client.Exceptions.PublishReturnException.RoutingKey.get -> string!
RabbitMQ.Client.RabbitMQTracingOptions
RabbitMQ.Client.RabbitMQTracingOptions.RabbitMQTracingOptions() -> void
RabbitMQ.Client.RabbitMQTracingOptions.UsePublisherAsParent.get -> bool
RabbitMQ.Client.RabbitMQTracingOptions.UsePublisherAsParent.set -> void
RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.get -> bool
RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.set -> void
static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.get -> RabbitMQ.Client.RabbitMQTracingOptions!
static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.set -> void
RabbitMQ.Client.SslOption.ClientCertificateContext.get -> System.Net.Security.SslStreamCertificateContext
RabbitMQ.Client.SslOption.ClientCertificateContext.set -> void

1 change: 1 addition & 0 deletions ...s/RabbitMQ.Client/PublicAPI.Unshipped.txt → ...PI/PublicAPI.Unshipped.netstandard2.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.get -> bool
RabbitMQ.Client.RabbitMQTracingOptions.UseRoutingKeyAsOperationName.set -> void
static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.get -> RabbitMQ.Client.RabbitMQTracingOptions!
static RabbitMQ.Client.RabbitMQActivitySource.TracingOptions.set -> void

13 changes: 13 additions & 0 deletions projects/RabbitMQ.Client/RabbitMQ.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,17 @@
<PackageReference Include="System.Threading.Channels" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>

<!-- Public API files per target framework -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.net8.0.txt" Link="PublicAPI.Unshipped.txt" />
<!-- Shipped surface is currently identical across TFMs; reuse common file -->
<AdditionalFiles Include="PublicAPI.Shipped.txt" Link="PublicAPI.Shipped.txt" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.netstandard2.0.txt" Link="PublicAPI.Unshipped.txt" />
<!-- Shipped surface is currently identical across TFMs; reuse common file -->
<AdditionalFiles Include="PublicAPI.Shipped.txt" Link="PublicAPI.Shipped.txt" />
</ItemGroup>
</Project>
8 changes: 8 additions & 0 deletions projects/RabbitMQ.Client/SslOption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,13 @@ internal SslProtocols UseFallbackTlsVersions()
Version = SslProtocols.Tls12;
return Version;
}

#if NET8_0_OR_GREATER
/// <summary>
/// Retrieve or set the <see cref="System.Net.Security.SslStreamCertificateContext"/> to supply
/// a set of certificates used for building a certificate chain.
/// </summary>
public SslStreamCertificateContext? ClientCertificateContext { get; set; }
#endif
}
}
Loading