SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not reuse WebsocketClientSpec.Builder between Requests (#2216)

Browse Source
This commit is contained in:
Johannes Rost
2021-05-21 23:26:41 +02:00
committed by GitHub
parent 71014d10bf
commit e9bf4e5fb7
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
View File

@@ -779,12 +779,15 @@ public class GatewayAutoConfiguration {
@ConditionalOnEnabledGlobalFilter(WebsocketRoutingFilter.class)
public ReactorNettyWebSocketClient reactorNettyWebSocketClient(HttpClientProperties properties,
HttpClient httpClient) {
WebsocketClientSpec.Builder builder = WebsocketClientSpec.builder()
.handlePing(properties.getWebsocket().isProxyPing());
if (properties.getWebsocket().getMaxFramePayloadLength() != null) {
builder.maxFramePayloadLength(properties.getWebsocket().getMaxFramePayloadLength());
}
return new ReactorNettyWebSocketClient(httpClient, builder);
Supplier<WebsocketClientSpec.Builder> builderSupplier = () -> {
WebsocketClientSpec.Builder builder = WebsocketClientSpec.builder()
.handlePing(properties.getWebsocket().isProxyPing());
if (properties.getWebsocket().getMaxFramePayloadLength() != null) {
builder.maxFramePayloadLength(properties.getWebsocket().getMaxFramePayloadLength());
}
return builder;
};
return new ReactorNettyWebSocketClient(httpClient, builderSupplier);
}
@Bean

19
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
import reactor.netty.http.client.HttpClient;
import reactor.netty.http.client.WebsocketClientSpec;
import reactor.netty.http.server.WebsocketServerSpec;
import org.springframework.boot.SpringApplication;
@@ -210,6 +211,24 @@ public class GatewayAutoConfigurationTests {
assertThat(spec2.protocols()).isNull();
}
@Test // gh-2215
public void webSocketClientSpecBuilderIsUniquePerReactorNettyWebSocketClient()
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
ReactorNettyWebSocketClient websocketClient = new GatewayAutoConfiguration.NettyConfiguration()
.reactorNettyWebSocketClient(new HttpClientProperties(), HttpClient.create());
// Method "buildSpec" has only private visibility
Method buildSpec = ReactorNettyWebSocketClient.class.getDeclaredMethod("buildSpec", String.class);
buildSpec.setAccessible(true);
WebsocketClientSpec spec1 = (WebsocketClientSpec) buildSpec.invoke(websocketClient, "p1");
WebsocketClientSpec spec2 = websocketClient.getWebsocketClientSpec();
assertThat(spec1.protocols()).isEqualTo("p1");
// Protocols should not be cached between requests:
assertThat(spec2.protocols()).isNull();
}
@EnableAutoConfiguration
@SpringBootConfiguration
protected static class Config {