Add reproducer for missing hostname verification for MySQL and update the PG test

Author: Traderjoe95

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLTLSTest.java

@@ -13,6 +13,9 @@
 
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.dns.AddressResolverOptions;
 import io.vertx.core.net.PemKeyCertOptions;
 import io.vertx.core.net.PemTrustOptions;
 import io.vertx.ext.unit.TestContext;
@@ -260,6 +263,53 @@ public void testConnFailWithVerifyIdentitySslMode(TestContext ctx) {
     }));
   }
 
+  @Test
+  public void testTLSInvalidHostname(TestContext ctx) {
+    MySQLConnection.connect(
+      vertx,
+      options
+        .setSslMode(SslMode.VERIFY_IDENTITY)
+        // The hostname in the test certificate is MySQL_Server_8.0.17_Auto_Generated_Server_Certificate,
+        // so 'localhost' should make for a failed connection
+        .setHost("localhost")
+        .setHostnameVerificationAlgorithm("HTTPS")
+        .setPemTrustOptions(new PemTrustOptions().addCertPath("tls/files/ca.pem"))
+        .setPemKeyCertOptions(new PemKeyCertOptions()
+          .setCertPath("tls/files/client-cert.pem")
+          .setKeyPath("tls/files/client-key.pem")),
+      ctx.asyncAssertFailure(err -> {
+        ctx.assertEquals(err.getMessage(), "No name matching localhost found");
+      }));
+  }
+
+  @Test
+  public void testTLSCorrectHostname(TestContext ctx) {
+    Vertx vertxWithHosts = Vertx.vertx(
+      new VertxOptions()
+        .setAddressResolverOptions(
+          new AddressResolverOptions()
+            .setHostsValue(Buffer.buffer("127.0.0.1 MySQL_Server_8.0.17_Auto_Generated_Server_Certificate\n"))
+        )
+    );
+
+    MySQLConnection.connect(
+      vertxWithHosts,
+      options
+        .setSslMode(SslMode.VERIFY_IDENTITY)
+        // The hostname in the test certificate is MySQL_Server_8.0.17_Auto_Generated_Server_Certificate,
+        // so 'localhost' should make for a failed connection
+        .setHost("MySQL_Server_8.0.17_Auto_Generated_Server_Certificate")
+        .setHostnameVerificationAlgorithm("HTTPS")
+        .setPemTrustOptions(new PemTrustOptions().addCertPath("tls/files/ca.pem"))
+        .setPemKeyCertOptions(new PemKeyCertOptions()
+          .setCertPath("tls/files/client-cert.pem")
+          .setKeyPath("tls/files/client-key.pem")),
+      ctx.asyncAssertSuccess(conn -> {
+        ctx.assertTrue(conn.isSSL());
+        vertxWithHosts.close();
+      }));
+  }
+
   @Test
   public void testConnFail(TestContext ctx) {
     options.setSslMode(SslMode.REQUIRED);

vertx-pg-client/src/test/java/io/vertx/pgclient/TLSTest.java

@@ -107,10 +107,7 @@ public void testTLSInvalidHostname(TestContext ctx) {
         // The hostname in the test certificate is thebrain.ca, so 'localhost' should make for a failed connection
         .setHost("localhost")
         .setHostnameVerificationAlgorithm("HTTPS")
-        .setPemTrustOptions(
-          new PemTrustOptions()
-            .addCertValue(vertx.fileSystem().readFileBlocking("tls/server.crt"))
-        ),
+        .setPemTrustOptions(new PemTrustOptions().addCertPath("tls/server.crt")),
       ctx.asyncAssertFailure(err -> {
         ctx.assertEquals(err.getMessage(), "SSL handshake failed");
         async.complete();
@@ -134,10 +131,7 @@ public void testTLSCorrectHostname(TestContext ctx) {
         .setSslMode(SslMode.VERIFY_FULL)
         .setHost("thebrain.ca")
         .setHostnameVerificationAlgorithm("HTTPS")
-        .setPemTrustOptions(
-          new PemTrustOptions()
-            .addCertValue(vertxWithHosts.fileSystem().readFileBlocking("tls/server.crt"))
-        ),
+        .setPemTrustOptions(new PemTrustOptions().addCertPath("tls/server.crt")),
       ctx.asyncAssertSuccess(conn -> {
         ctx.assertTrue(conn.isSSL());
         vertxWithHosts.close();