Skip to content

Commit

Permalink
Upgrade netty to 4.1.86 #2 (confluentinc#9770)
Browse files Browse the repository at this point in the history
* Revert "Revert "[KSE-1612] Upgrade netty to 4.1.86 and vertx to 4.3.7 (confluentinc#9764)" (confluentinc#9766)"

This reverts commit 1ecd4f7.

* 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 vert-x3/vertx-web@c667f07
  • Loading branch information
rkhachatryan committed Feb 15, 2023
1 parent 4e50f0b commit 1bea324
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,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"
));
}
Expand All @@ -558,7 +558,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"
));
}
Expand Down Expand Up @@ -786,6 +786,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 {
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,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>
Expand All @@ -151,8 +151,8 @@
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>

Expand Down

0 comments on commit 1bea324

Please sign in to comment.