root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22367 from envious/adding-maxframebuffersize

This commit is contained in:
Rossen Stoyanchev 2019-03-12 15:59:19 -04:00
parent 2b4cd5cf56 2d4247b2da
commit baa7e2e228
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
import org.springframework.web.reactive.socket.HandshakeInfo; import org.springframework.web.reactive.socket.HandshakeInfo;
import org.springframework.web.reactive.socket.WebSocketHandler; import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.WebSocketSession; import org.springframework.web.reactive.socket.WebSocketSession;
import org.springframework.web.reactive.socket.adapter.NettyWebSocketSessionSupport;
import org.springframework.web.reactive.socket.adapter.ReactorNettyWebSocketSession; import org.springframework.web.reactive.socket.adapter.ReactorNettyWebSocketSession;
/** /**
@ -43,6 +44,7 @@ public class ReactorNettyWebSocketClient implements WebSocketClient {
private static final Log logger = LogFactory.getLog(ReactorNettyWebSocketClient.class); private static final Log logger = LogFactory.getLog(ReactorNettyWebSocketClient.class);
private int maxFramePayloadLength = NettyWebSocketSessionSupport.DEFAULT_FRAME_MAX_SIZE;
private final HttpClient httpClient; private final HttpClient httpClient;
@ -63,7 +65,6 @@ public class ReactorNettyWebSocketClient implements WebSocketClient {
this.httpClient = httpClient; this.httpClient = httpClient;
} }
/** /**
* Return the configured {@link HttpClient}. * Return the configured {@link HttpClient}.
*/ */
@ -71,6 +72,29 @@ public class ReactorNettyWebSocketClient implements WebSocketClient {
return this.httpClient; return this.httpClient;
} }
/**
* Configure the maximum allowable frame payload length. Setting this value
* to your application's requirement may reduce denial of service attacks
* using long data frames.
* <p>Corresponds to the argument with the same name in the constructor of
* {@link io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory
* WebSocketServerHandshakerFactory} in Netty.
* <p>By default set to 65536 (64K).
* @param maxFramePayloadLength the max length for frames.
* @since 5.2
*/
public void setMaxFramePayloadLength(int maxFramePayloadLength) {
this.maxFramePayloadLength = maxFramePayloadLength;
}
/**
* Return the configured {@link #setMaxFramePayloadLength(int) maxFramePayloadLength}.
* @since 5.2
*/
public int getMaxFramePayloadLength() {
return maxFramePayloadLength;
}
@Override @Override
public Mono<Void> execute(URI url, WebSocketHandler handler) { public Mono<Void> execute(URI url, WebSocketHandler handler) {
@ -79,9 +103,10 @@ public class ReactorNettyWebSocketClient implements WebSocketClient {
@Override @Override
public Mono<Void> execute(URI url, HttpHeaders requestHeaders, WebSocketHandler handler) { public Mono<Void> execute(URI url, HttpHeaders requestHeaders, WebSocketHandler handler) {
String protocols = StringUtils.collectionToCommaDelimitedString(handler.getSubProtocols());
return getHttpClient() return getHttpClient()
.headers(nettyHeaders -> setNettyHeaders(requestHeaders, nettyHeaders)) .headers(nettyHeaders -> setNettyHeaders(requestHeaders, nettyHeaders))
.websocket(StringUtils.collectionToCommaDelimitedString(handler.getSubProtocols())) .websocket(protocols, getMaxFramePayloadLength())
.uri(url.toString()) .uri(url.toString())
.handle((inbound, outbound) -> { .handle((inbound, outbound) -> {
HttpHeaders responseHeaders = toHttpHeaders(inbound); HttpHeaders responseHeaders = toHttpHeaders(inbound);