Skip to content

Support configurable TLS client SNI validation and handle FQDNs … #1383

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 1 commit into from
Jan 27, 2025
Merged

Support configurable TLS client SNI validation and handle FQDNs … #1383

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 ...ng-tls/src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/TlsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class TlsConfiguration extends Configuration
public static final LongPropertyDef TLS_AWAIT_SYNC_CLOSE_MILLIS;
public static final BooleanPropertyDef TLS_PROACTIVE_CLIENT_REPLY_BEGIN;
public static final BooleanPropertyDef TLS_CLIENT_HTTPS_IDENTIFICATION;
public static final BooleanPropertyDef TLS_CLIENT_SERVER_NAME_INDICATION;
public static final BooleanPropertyDef TLS_VERBOSE;
public static final BooleanPropertyDef TLS_DEBUG;

Expand All @@ -42,6 +43,7 @@ public class TlsConfiguration extends Configuration
TLS_AWAIT_SYNC_CLOSE_MILLIS = config.property("await.sync.close.millis", 3000L);
TLS_PROACTIVE_CLIENT_REPLY_BEGIN = config.property("proactive.client.reply.begin", false);
TLS_CLIENT_HTTPS_IDENTIFICATION = config.property("client.https.identification", true);
TLS_CLIENT_SERVER_NAME_INDICATION = config.property("client.server.name.indication", true);
TLS_VERBOSE = config.property("verbose", TlsConfiguration::verboseDefault);
TLS_DEBUG = config.property("debug", TlsConfiguration::debugDefault);
TLS_CONFIG = config;
Expand Down Expand Up @@ -83,6 +85,11 @@ public boolean clientHttpsIdentification()
return TLS_CLIENT_HTTPS_IDENTIFICATION.getAsBoolean(this);
}

public boolean clientServerNameIndication()
{
return TLS_CLIENT_SERVER_NAME_INDICATION.getAsBoolean(this);
}

public boolean verbose()
{
return TLS_VERBOSE.getAsBoolean(this);
Expand Down
11 changes: 10 additions & 1 deletion ...src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/config/TlsBindingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public final class TlsBindingConfig
private SSLContext context;

private boolean clientHttpsIdentification;
private boolean clientServerNameIndication;

public TlsBindingConfig(
BindingConfig binding)
Expand Down Expand Up @@ -126,6 +127,7 @@ public void init(

this.context = context;
this.clientHttpsIdentification = config.clientHttpsIdentification();
this.clientServerNameIndication = config.clientServerNameIndication();
}
catch (Exception ex)
{
Expand Down Expand Up @@ -240,9 +242,10 @@ public SSLEngine newClientEngine(
parameters.setEndpointIdentificationAlgorithm("HTTPS");
}

if (sni != null)
if (clientServerNameIndication && sni != null)
{
List<SNIServerName> serverNames = sni.stream()
.map(TlsBindingConfig::trimHostnameTrailingDot)
.map(SNIHostName::new)
.collect(toList());
parameters.setServerNames(serverNames);
Expand Down Expand Up @@ -496,4 +499,10 @@ private List<String> ignoreEmptyNames(

return names;
}

private static String trimHostnameTrailingDot(
String hostname)
{
return hostname.endsWith(".") ? hostname.substring(0, hostname.length() - 1) : hostname;
}
}
Loading