From a2cbd00bdbeaa22f4b5318700da92dc67f840f09 Mon Sep 17 00:00:00 2001
From: Roman <rkhachatryan@confluent.io>
Date: Tue, 14 Feb 2023 20:16:19 +0100
Subject: [PATCH] Upgrade netty to 4.1.86 #2 (#9770)

* Revert "Revert "[KSE-1612] Upgrade netty to 4.1.86 and vertx to 4.3.7 (#9764)" (#9766)"

This reverts commit 1ecd4f7b95165743317b348b876f405827051878.

* Fix KsqlClientTest

Update exception expectations in KsqlClientTest according to the
upgraded vert.x.

* Update origin in CorsTest as per OWASP

Include schema into the ORIGIN,
see https://github.com/vert-x3/vertx-web/commit/c667f07d14cba3e59f39a8b4abc7b4017258cf8c
---
 .../src/test/java/io/confluent/ksql/api/CorsTest.java     | 4 ++--
 .../io/confluent/ksql/rest/client/KsqlClientTest.java     | 5 +++--
 pom.xml                                                   | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/api/CorsTest.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/api/CorsTest.java
index 7694ea5a7ae7..dcd03b434254 100644
--- a/ksqldb-rest-app/src/test/java/io/confluent/ksql/api/CorsTest.java
+++ b/ksqldb-rest-app/src/test/java/io/confluent/ksql/api/CorsTest.java
@@ -49,7 +49,7 @@ public class CorsTest extends BaseApiTest {
   private static final String DEFAULT_ACCESS_CONTROL_ALLOW_METHODS = "GET,POST,HEAD";
 
   private static final String URI = "/query-stream";
-  private static final String ORIGIN = "wibble.com";
+  private static final String ORIGIN = "http://wibble.com";
 
   private final Map<String, Object> config = new HashMap<>();
 
@@ -132,7 +132,7 @@ public void shouldRejectCorsRequestOriginExactMatch() throws Exception {
 
   @Test
   public void shouldAcceptCorsRequestOriginExactMatchOneOfList() throws Exception {
-    shouldAcceptCorsRequest(ORIGIN, "foo.com,wibble.com");
+    shouldAcceptCorsRequest(ORIGIN, "foo.com," + ORIGIN);
   }
 
   @Test
diff --git a/ksqldb-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientTest.java b/ksqldb-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientTest.java
index 4744dcb813ea..f292d2eaf714 100644
--- a/ksqldb-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientTest.java
+++ b/ksqldb-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientTest.java
@@ -486,7 +486,7 @@ public void shouldFailToStartClientRequestWithNullKeystorePassword() throws Exce
     );
 
     // Then:
-    assertThat(e.getMessage(), containsString(
+    assertThat(e.getCause().getMessage(), containsString(
         "java.io.IOException: Keystore was tampered with, or password was incorrect"
     ));
   }
@@ -507,7 +507,7 @@ public void shouldFailToStartClientRequestWithInvalidKeystorePassword() throws E
     );
 
     // Then:
-    assertThat(e.getMessage(), containsString(
+    assertThat(e.getCause().getMessage(), containsString(
         "java.io.IOException: Keystore was tampered with, or password was incorrect"
     ));
   }
@@ -725,6 +725,7 @@ private void startClientWithTlsAndTruststorePassword(final String password) {
     props.putAll(ClientTrustStore.trustStoreProps());
     props.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, password);
     createClient(props);
+    ksqlClient.target(serverUri).getServerInfo().get();
   }
 
   private void startServerWithTls() throws Exception {
diff --git a/pom.xml b/pom.xml
index c2b96a366b83..c5386188191d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
         <wiremock.version>2.24.0</wiremock.version>
         <clearspring-analytics.version>2.9.5</clearspring-analytics.version>
         <icu.version>67.1</icu.version>
-        <vertx.version>3.9.14</vertx.version>
+        <vertx.version>4.3.7</vertx.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <skip.docker.build>true</skip.docker.build>
         <skip.docker.test>true</skip.docker.test>
@@ -137,15 +137,15 @@
         <io.confluent.ksql.version>6.1.10-0</io.confluent.ksql.version>
         <io.confluent.schema-registry.version>${confluent.version.range}</io.confluent.schema-registry.version>
 
-        <netty-tcnative-version>2.0.46.Final</netty-tcnative-version>
+        <netty-tcnative-version>2.0.54.Final</netty-tcnative-version>
         <!-- We normally get this from common, but Vertx is built against this -->
         <!-- Note: `netty` depends on `tcnative` and if we bump `netty`
              we might need to bump `tcnative`, too.
              Please check top level `pom.xml` at https://github.com/netty/netty
              for the netty version we bump to (ie, corresponding git tag),
              to find the correct `tcnative` version. -->
-        <netty.version>4.1.84.Final</netty.version>
-        <netty-codec-http2-version>4.1.84.Final</netty-codec-http2-version>
+        <netty.version>4.1.86.Final</netty.version>
+        <netty-codec-http2-version>4.1.86.Final</netty-codec-http2-version>
         <jersey-common>2.34</jersey-common>
     </properties>