Remove HttpClientConfig#forceSNI.

Motivation:

HttpClientConfig#forceSNI has been introduced as continuation of HttpClientOptions#forceSNI.

This options goes against the SNI hostname validation and is actually not supported by the QUIC ssl engine.

It can be worked around with specific Vert.x resolver hosts configuration.

Changes:

Remove HttpClientConfig#forceSNI, keep it working on HttpClientOptions.

Author: vietj

vertx-core/src/main/java/io/vertx/core/http/HttpClientConfig.java

@@ -74,7 +74,6 @@ private static QuicClientConfig defaultQuicConfig() {
   private String defaultHost;
   private int defaultPort;
   private int maxRedirects;
-  private boolean forceSni;
   private ObservabilityConfig observabilityConfig;
   private boolean shared;
   private String name;
@@ -93,7 +92,6 @@ public HttpClientConfig() {
     this.defaultHost = HttpClientOptions.DEFAULT_DEFAULT_HOST;
     this.defaultPort = HttpClientOptions.DEFAULT_DEFAULT_PORT;
     this.maxRedirects = HttpClientOptions.DEFAULT_MAX_REDIRECTS;
-    this.forceSni = HttpClientOptions.DEFAULT_FORCE_SNI;
     this.observabilityConfig = null;
     this.shared = HttpClientOptions.DEFAULT_SHARED;
     this.name = HttpClientOptions.DEFAULT_NAME;
@@ -113,7 +111,6 @@ public HttpClientConfig(HttpClientConfig other) {
     this.defaultHost = other.defaultHost;
     this.defaultPort = other.defaultPort;
     this.maxRedirects = other.maxRedirects;
-    this.forceSni = other.forceSni;
     this.observabilityConfig = other.observabilityConfig != null ? new ObservabilityConfig(other.observabilityConfig) : null;
     this.shared = other.shared;
     this.name = other.name;
@@ -141,7 +138,6 @@ public HttpClientConfig(HttpClientOptions options) {
     this.defaultHost = options.getDefaultHost();
     this.defaultPort = options.getDefaultPort();
     this.maxRedirects = options.getMaxRedirects();
-    this.forceSni = options.isForceSni();
     this.observabilityConfig = observabilityConfig;
     this.shared = options.isShared();
     this.name = options.getName();
@@ -450,25 +446,6 @@ public HttpClientConfig setMaxRedirects(int maxRedirects) {
     return this;
   }
 
-  /**
-   * @return whether the client should always use SNI on TLS/SSL connections
-   */
-  public boolean isForceSni() {
-    return forceSni;
-  }
-
-  /**
-   * By default, the server name is only sent for Fully Qualified Domain Name (FQDN), setting
-   * this property to {@code true} forces the server name to be always sent.
-   *
-   * @param forceSni {@code true} when the client should always use SNI on TLS/SSL connections
-   * @return a reference to this, so the API can be used fluently
-   */
-  public HttpClientConfig setForceSni(boolean forceSni) {
-    this.forceSni = forceSni;
-    return this;
-  }
-
   /**
    * @return the client observability config.
    */

vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBuilderInternal.java

@@ -39,6 +39,7 @@ public final class HttpClientBuilderInternal implements HttpClientBuilder {
   private HttpClientOptions clientOptions; // To be removed
   private ClientSSLOptions sslOptions;
   private SSLEngineOptions sslEngineOptions;
+  private boolean forceSNI;
   private PoolOptions poolOptions;
   private Handler<HttpConnection> connectHandler;
   private Function<HttpClientResponse, Future<RequestOptions>> redirectHandler;
@@ -53,15 +54,25 @@ public HttpClientBuilderInternal(VertxInternal vertx) {
 
   public HttpClientBuilderInternal with(HttpClientConfig config) {
     this.clientConfig = config;
+    this.forceSNI = false;
     return this;
   }
 
   @Override
   public HttpClientBuilderInternal with(HttpClientOptions options) {
-    this.clientConfig = new HttpClientConfig(options);
-    this.sslOptions = options.getSslOptions();
-    this.sslEngineOptions = options.getSslEngineOptions();
-    this.clientOptions = options;
+    if (options != null) {
+      this.clientConfig = new HttpClientConfig(options);
+      this.sslOptions = options.getSslOptions();
+      this.sslEngineOptions = options.getSslEngineOptions();
+      this.clientOptions = options;
+      this.forceSNI = options.isForceSni();
+    } else {
+      this.clientConfig = null;
+      this.sslOptions = null;
+      this.sslEngineOptions = null;
+      this.clientOptions = null;
+      this.forceSNI = false;
+    }
     return this;
   }
 
@@ -277,7 +288,7 @@ public HttpClientInternal build() {
         co.isDecompressionEnabled(),
         logConfig != null && logConfig.isEnabled(),
         logConfig != null ? logConfig.getDataFormat() : null,
-        co.isForceSni(),
+        forceSNI,
         supportedVersions.contains(HttpVersion.HTTP_1_1) || supportedVersions.contains(HttpVersion.HTTP_1_0) ? (co.getHttp1Config() != null ? co.getHttp1Config() : new Http1ClientConfig()) : null,
         supportedVersions.contains(HttpVersion.HTTP_2) ? (co.getHttp2Config() != null ? co.getHttp2Config() : new Http2ClientConfig()) : null,
         co.getTcpConfig().getIdleTimeout(),

vertx-core/src/main/java/io/vertx/core/http/impl/quic/QuicHttpClientTransport.java

@@ -43,7 +43,6 @@ public class QuicHttpClientTransport implements HttpClientTransport {
   private final Http3Settings localSettings;
   private final Http3FrameLogger frameLogger;
   private final long maxConcurrency;
-  private final boolean forceSni;
 
   public QuicHttpClientTransport(VertxInternal vertx, HttpClientConfig config) {
 
@@ -77,7 +76,6 @@ public QuicHttpClientTransport(VertxInternal vertx, HttpClientConfig config) {
     this.localSettings = localSettings;
     this.client = client;
     this.frameLogger = logEnabled ? new Http3FrameLogger(InternalLogLevel.DEBUG) : null;
-    this.forceSni = config.isForceSni();
   }
 
   public QuicClientImpl client() {

vertx-core/src/main/java/io/vertx/core/http/impl/tcp/TcpHttpClientTransport.java

@@ -65,14 +65,15 @@ public class TcpHttpClientTransport implements HttpClientTransport {
 
   public static TcpHttpClientTransport create(NetClientInternal netClient,
                                               HttpClientConfig config,
+                                              boolean forceSNI,
                                               HttpClientMetrics httpMetrics) {
     ObservabilityConfig observabilityConfig = config.getObservabilityConfig();
     return new TcpHttpClientTransport(netClient,
       observabilityConfig != null ? observabilityConfig.getTracingPolicy() : null,
       config.isDecompressionEnabled(),
       config.getTcpConfig().getLogConfig() != null && config.getTcpConfig().getLogConfig().isEnabled(),
       config.getTcpConfig().getLogConfig() != null ? config.getTcpConfig().getLogConfig().getDataFormat() : null,
-      config.isForceSni(),
+      forceSNI,
       config.getHttp1Config(),
       config.getHttp2Config(),
       config.getTcpConfig().getIdleTimeout(),

vertx-core/src/main/java/io/vertx/core/impl/VertxImpl.java

@@ -454,7 +454,7 @@ private WebSocketClientImpl createWebSocketClientImpl(WebSocketClientOptions opt
       .protocol("http")
       .sslOptions(options.getSslOptions())
       .build();
-    TcpHttpClientTransport channelConnector = TcpHttpClientTransport.create(tcpClient, config, httpMetrics);
+    TcpHttpClientTransport channelConnector = TcpHttpClientTransport.create(tcpClient, config, false, httpMetrics);
     return new WebSocketClientImpl(this, o, options, channelConnector, httpMetrics);
   }
 

vertx-core/src/test/java/io/vertx/tests/http/http3/Http3Config.java

@@ -155,7 +155,9 @@ public HttpClientConfig setVerifyHost(boolean verify) {
       }
       @Override
       public HttpClientConfig setForceSni(boolean forceSni) {
-        config.setForceSni(forceSni);
+        if (forceSni) {
+          throw new UnsupportedOperationException();
+        }
         return this;
       }
       @Override