From 6f3650fc511e255079a5d56449543027bb555da4 Mon Sep 17 00:00:00 2001 From: Gabriel-Trintinalia Date: Fri, 31 May 2024 14:37:50 +1000 Subject: [PATCH] [MINOR] - Vertx and Netty minor version bumps (#7156) Signed-off-by: Gabriel-Trintinalia --- .../GraphQLHttpServiceHostWhitelistTest.java | 6 +- .../JsonRpcHttpServiceHostAllowlistTest.java | 6 +- .../websocket/WebSocketHostAllowlistTest.java | 6 +- gradle/verification-metadata.xml | 541 ++++++++---------- gradle/versions.gradle | 10 +- 5 files changed, 252 insertions(+), 317 deletions(-) diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java index c2fb617fbb8..ec33bd92689 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java @@ -155,8 +155,8 @@ private int doRequest(final String hostname) throws IOException { @Test public void requestWithMalformedHostIsRejected() throws IOException { graphQLConfig.setHostsAllowlist(hostsWhitelist); - Assertions.assertThat(doRequest("ally:friend")).isEqualTo(403); - Assertions.assertThat(doRequest("ally:123456")).isEqualTo(403); - Assertions.assertThat(doRequest("ally:friend:1234")).isEqualTo(403); + Assertions.assertThat(doRequest("ally:friend")).isEqualTo(400); + Assertions.assertThat(doRequest("ally:123456")).isEqualTo(400); + Assertions.assertThat(doRequest("ally:friend:1234")).isEqualTo(400); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java index a261ff2351a..af5228dc06e 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java @@ -206,8 +206,8 @@ private int doRequest(final String hostname) throws IOException { @Test public void requestWithMalformedHostIsRejected() throws IOException { jsonRpcConfig.setHostsAllowlist(hostsAllowlist); - assertThat(doRequest("ally:friend")).isEqualTo(403); - assertThat(doRequest("ally:123456")).isEqualTo(403); - assertThat(doRequest("ally:friend:1234")).isEqualTo(403); + assertThat(doRequest("ally:friend")).isEqualTo(400); + assertThat(doRequest("ally:123456")).isEqualTo(400); + assertThat(doRequest("ally:friend:1234")).isEqualTo(400); } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java index a53ef3d1421..3ac348c01a1 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java @@ -196,9 +196,9 @@ public void websocketRequestWithMalformedHostIsRejected(final String hostname) { public void httpRequestWithMalformedHostIsRejected() throws Throwable { webSocketConfiguration.setAuthenticationEnabled(false); webSocketConfiguration.setHostsAllowlist(hostsAllowlist); - doHttpRequestAndVerify(testContext, "ally:friend", 403); - doHttpRequestAndVerify(testContext, "ally:123456", 403); - doHttpRequestAndVerify(testContext, "ally:friend:1234", 403); + doHttpRequestAndVerify(testContext, "ally:friend", 400); + doHttpRequestAndVerify(testContext, "ally:123456", 400); + doHttpRequestAndVerify(testContext, "ally:friend:1234", 400); } private void doHttpRequestAndVerify( diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7ad666233f6..c6e7701e625 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1,5 +1,5 @@ - + true false @@ -1664,12 +1664,12 @@ - - - + + + - - + + @@ -1677,9 +1677,9 @@ - - - + + + @@ -1687,64 +1687,44 @@ - - - + + + - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - - - - - - + + - - - + + + - - + + - - - + + + - - - - - - - + + @@ -1752,104 +1732,84 @@ - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - + + - - - + + + - - + + - - - - - - + + + - - - - + + - - - - - - + + + - - - - + + - - - + + + - - + + @@ -1857,25 +1817,20 @@ - - - + + + - - - - - - - + + - - - + + + - - + + @@ -1883,59 +1838,44 @@ - - - + + + - - - + + + - - - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - + + - - - + + + - - + + - - + + @@ -1959,96 +1899,91 @@ - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2636,49 +2571,49 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2686,9 +2621,9 @@ - - - + + + @@ -2701,12 +2636,12 @@ - - - + + + - - + + @@ -2735,49 +2670,49 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 427e6e81897..ba924e50950 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -69,11 +69,11 @@ dependencyManagement { dependency 'io.kubernetes:client-java:18.0.1' - dependency 'io.netty:netty-all:4.1.104.Final' + dependency 'io.netty:netty-all:4.1.110.Final' dependency 'io.netty:netty-tcnative-boringssl-static:2.0.62.Final' - dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.104.Final', classifier: 'linux-x86_64' - dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.104.Final', classifier: 'osx-x86_64' - dependency 'io.netty:netty-transport-native-unix-common:4.1.104.Final' + dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.110.Final', classifier: 'linux-x86_64' + dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.110.Final', classifier: 'osx-x86_64' + dependency 'io.netty:netty-transport-native-unix-common:4.1.110.Final' dependency 'io.opentelemetry:opentelemetry-api:1.33.0' dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.33.0' @@ -116,7 +116,7 @@ dependencyManagement { entry 'tuweni-units' } - dependencySet(group: 'io.vertx', version: '4.5.4') { + dependencySet(group: 'io.vertx', version: '4.5.8') { entry 'vertx-auth-jwt' entry 'vertx-codegen' entry 'vertx-core'