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

formatting

Browse Source
This commit is contained in:
spencergibb
2020-11-10 12:54:23 -05:00
parent 691a13c68c
commit b0b77ce83c
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java
View File

@@ -123,11 +123,9 @@ public class WebsocketRoutingFilter implements GlobalFilter, Ordered {
HttpHeaders filtered = new HttpHeaders();
filtered.addAll(headers);
filtered.remove(HttpHeaders.HOST);
boolean preserveHost = exchange
.getAttributeOrDefault(PRESERVE_HOST_HEADER_ATTRIBUTE, false);
boolean preserveHost = exchange.getAttributeOrDefault(PRESERVE_HOST_HEADER_ATTRIBUTE, false);
if (preserveHost) {
String host = exchange.getRequest().getHeaders()
.getFirst(HttpHeaders.HOST);
String host = exchange.getRequest().getHeaders().getFirst(HttpHeaders.HOST);
filtered.add(HttpHeaders.HOST, host);
}
return filtered;

16
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java
View File

@@ -77,21 +77,17 @@ public class WebsocketRoutingFilterTests {
@SuppressWarnings("unchecked")
private void assertDefaultHeadersFilters(boolean preserveHostHeader) {
ObjectProvider<List<HttpHeadersFilter>> headersFilters = mock(
ObjectProvider.class);
ObjectProvider<List<HttpHeadersFilter>> headersFilters = mock(ObjectProvider.class);
when(headersFilters.getIfAvailable(any())).thenReturn(new ArrayList<>());
WebsocketRoutingFilter filter = new WebsocketRoutingFilter(
mock(WebSocketClient.class), mock(WebSocketService.class),
headersFilters);
WebsocketRoutingFilter filter = new WebsocketRoutingFilter(mock(WebSocketClient.class),
mock(WebSocketService.class), headersFilters);
List<HttpHeadersFilter> filters = filter.getHeadersFilters();
MockServerHttpRequest request = MockServerHttpRequest.get("ws://not-matters-that")
.header(HOST, "MyHost").header("Sec-Websocket-Something", "someval")
.header("x-foo", "bar").build();
MockServerHttpRequest request = MockServerHttpRequest.get("ws://not-matters-that").header(HOST, "MyHost")
.header("Sec-Websocket-Something", "someval").header("x-foo", "bar").build();
MockServerWebExchange exchange = MockServerWebExchange.from(request);
exchange.getAttributes().put(PRESERVE_HOST_HEADER_ATTRIBUTE, preserveHostHeader);
HttpHeaders httpHeaders = HttpHeadersFilter.filterRequest(filters, exchange);
assertThat(httpHeaders).doesNotContainKeys("Sec-Websocket-Something")
.containsKey("x-foo");
assertThat(httpHeaders).doesNotContainKeys("Sec-Websocket-Something").containsKey("x-foo");
if (preserveHostHeader) {
assertThat(httpHeaders).containsKey(HOST);
}