Skip to content

Use system-defined TLS protocol versions #1170

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
rhysparry wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use system-defined TLS protocol versions #1170

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
6 changes: 5 additions & 1 deletion source/Octopus.Tentacle/Communications/TentacleCommunicationsModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,16 @@ protected override void Load(ContainerBuilder builder)
halibutTimeoutsAndLimits.TcpNoDelay = useTcpNoDelay;
halibutTimeoutsAndLimits.UseAsyncListener = useAsyncListener;

ISslConfigurationProvider sslConfigurationProvider = EnvironmentOverrides.UseLegacyExplicitSslConfiguration
? new LegacySslConfigurationProvider()
: new DefaultSslConfigurationProvider();

var halibutRuntime = new HalibutRuntimeBuilder()
.WithServiceFactory(services)
.WithServerCertificate(configuration.TentacleCertificate!)
.WithMessageSerializer(serializerBuilder => serializerBuilder.WithLegacyContractSupport())
.WithHalibutTimeoutsAndLimits(halibutTimeoutsAndLimits)
.WithSslConfigurationProvider(new LegacySslConfigurationProvider())
.WithSslConfigurationProvider(sslConfigurationProvider)
.Build();

halibutRuntime.SetFriendlyHtmlPageContent(FriendlyHtmlPageContent);
Expand Down
10 changes: 10 additions & 0 deletions source/Octopus.Tentacle/EnvironmentOverrides.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System;

namespace Octopus.Tentacle
{
public static class EnvironmentOverrides
{
public static bool UseLegacyExplicitSslConfiguration =>
Environment.GetEnvironmentVariable("OCTOPUS_TENTACLE_USE_LEGACY_TLS") == "YES";
Copy link
Contributor

@evolutionise evolutionise Dec 28, 2025

Choose a reason for hiding this comment

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

Should the value for this be TRUE rather than YES, as it should follow the standard bool convention?

}
}
11 changes: 7 additions & 4 deletions source/Octopus.Tentacle/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ public Program(string[] commandLineArguments) : base("Octopus Deploy: Tentacle",
OctopusTentacle.EnvironmentInformation,
commandLineArguments)
{
ServicePointManager.SecurityProtocol =
SecurityProtocolType.Tls
| SecurityProtocolType.Tls11
| SecurityProtocolType.Tls12;
if (EnvironmentOverrides.UseLegacyExplicitSslConfiguration)
{
ServicePointManager.SecurityProtocol =
SecurityProtocolType.Tls
| SecurityProtocolType.Tls11
| SecurityProtocolType.Tls12;
}
}

protected override ApplicationName ApplicationName => ApplicationName.Tentacle;
Expand Down