Skip to content

SslIdentificationAlgorithmTest - do not resolve DNS for custom hostnames #65

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
the-thing merged 2 commits into from
Sep 22, 2026
Merged

SslIdentificationAlgorithmTest - do not resolve DNS for custom hostnames #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1835490
do not resolve DNS when creating SSLEngine for SNI hostnames
the-thing Sep 22, 2026
7adcd48
parametrize test for TLS 1.2 / 1.3 separately
the-thing Sep 22, 2026
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
47 changes: 37 additions & 10 deletions mina-core/src/test/java/org/apache/mina/filter/ssl/SslIdentificationAlgorithmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,21 @@
import org.apache.mina.util.AvailablePortFinder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SNIHostName;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.TrustManagerFactory;
import java.net.InetSocketAddress;
import java.security.KeyStore;
import java.security.Security;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

Expand All @@ -57,6 +63,7 @@
* client-san-ext.truststore - keystore with trusted certificate
* </pre>
*/
@RunWith(Parameterized.class)
public class SslIdentificationAlgorithmTest {

private static final String KEY_MANAGER_FACTORY_ALGORITHM;
Expand All @@ -71,24 +78,37 @@ public class SslIdentificationAlgorithmTest {
KEY_MANAGER_FACTORY_ALGORITHM = algorithm;
}

@Parameterized.Parameters(name = "{0}")
public static List<Object[]> getParameters() {
return Arrays.asList(new Object[][]{{"TLSv1.2"}, {"TLSv1.3"}});
}

private final String enabledProtocol;
private int port;
private CountDownLatch handshakeDone;

private class CustomSslFilter extends SslFilter {

public SslIdentificationAlgorithmTest(String enabledProtocol) {
this.enabledProtocol = enabledProtocol;
}

private static class CustomSslFilter extends SslFilter {
public CustomSslFilter(SSLContext sslContext) {
super(sslContext);
}

protected SSLEngine createEngine(IoSession session, InetSocketAddress addr) {
//Add your SNI host name and port in the IOSession
String sniHostNames = (String)session.getAttribute( "SNIHostNames" );
String sniHostName = (String)session.getAttribute( "SNIHostNames" );
int portNumber = (int)session.getAttribute( "PortNumber");
InetSocketAddress peer = new InetSocketAddress( sniHostNames, portNumber);


SSLEngine sslEngine;

if (addr != null) {

if (addr != null && sniHostName != null) {
// Use createUnresolved to avoid blocking DNS lookup on the I/O thread
InetSocketAddress peer = InetSocketAddress.createUnresolved(sniHostName, portNumber);
sslEngine = sslContext.createSSLEngine(peer.getHostName(), peer.getPort());
} else if (addr != null) {
sslEngine = sslContext.createSSLEngine(addr.getHostString(), addr.getPort());
} else {
sslEngine = sslContext.createSSLEngine();
}
Expand Down Expand Up @@ -120,6 +140,13 @@ protected SSLEngine createEngine(IoSession session, InetSocketAddress addr) {
}

sslEngine.setUseClientMode(!session.isServer());

// Explicitly set the SNI extension so the server receives the correct hostname
if (sniHostName != null && !session.isServer()) {
SSLParameters sslParameters = sslEngine.getSSLParameters();
sslParameters.setServerNames(Collections.singletonList(new SNIHostName(sniHostName)));
sslEngine.setSSLParameters(sslParameters);
}

return sslEngine;
}
Expand Down Expand Up @@ -229,7 +256,7 @@ private void startAcceptor(SSLContext sslContext) throws Exception {
acceptor.setReuseAddress(true);

SslFilter sslFilter = new SslFilter(sslContext);
sslFilter.setEnabledProtocols(new String[] {"TLSv1.2"});
sslFilter.setEnabledProtocols(enabledProtocol);

DefaultIoFilterChainBuilder filters = acceptor.getFilterChain();
filters.addLast("ssl", sslFilter);
Expand Down Expand Up @@ -271,7 +298,7 @@ public void onPreAdd(IoFilterChain parent, String name, NextFilter nextFilter) t
};

sslFilter.setEndpointIdentificationAlgorithm("HTTPS");
sslFilter.setEnabledProtocols(new String[] {"TLSv1.2"});
sslFilter.setEnabledProtocols(enabledProtocol);

DefaultIoFilterChainBuilder filters = connector.getFilterChain();
filters.addLast("ssl", sslFilter);
Expand Down Expand Up @@ -310,7 +337,7 @@ private SSLContext createSSLContext(String keyStorePath, String trustStorePath)
TrustManagerFactory tmf = TrustManagerFactory.getInstance(KEY_MANAGER_FACTORY_ALGORITHM);
tmf.init(trustStore);

SSLContext ctx = SSLContext.getInstance("TLSv1.2");
SSLContext ctx = SSLContext.getInstance(enabledProtocol);
ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);

return ctx;
Expand Down
Loading