Skip to content

Commit 8757e54

Browse files
spencergibbspencergibb
committed
formatting
1 parent aba9df5 commit 8757e54

File tree

2 files changed

+41
-53
lines changed

2 files changed

+41
-53
lines changed

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,13 @@ public void forwardedHeaderExists() throws UnknownHostException {
9696

9797
assertThat(forwardeds).hasSize(3);
9898
Optional<Forwarded> added = forwardeds.stream()
99-
.filter(forwarded -> forwarded.get("for").contains("10.0.0.1:80"))
100-
.findFirst();
99+
.filter(forwarded -> forwarded.get("for").contains("10.0.0.1:80")).findFirst();
101100
assertThat(added).isPresent();
102101
added.ifPresent(forwarded -> {
103102
assertThat(forwarded.getValues()).containsEntry("proto", "http").containsEntry("for", "\"10.0.0.1:80\"");
104103
});
105104
Optional<Forwarded> existing = forwardeds.stream()
106-
.filter(forwarded -> forwarded.get("for").equals("23.45.67.89"))
107-
.findFirst();
105+
.filter(forwarded -> forwarded.get("for").equals("23.45.67.89")).findFirst();
108106
assertThat(existing).isPresent();
109107
existing.ifPresent(forwarded -> {
110108
assertThat(forwarded.getValues()).containsEntry("for", "23.45.67.89");
@@ -216,36 +214,34 @@ public void forwardedParsedCorrectly() {
216214
@Test
217215
public void trustedProxiesConditionMatches() {
218216
new ReactiveWebApplicationContextRunner()
219-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
220-
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
221-
.withPropertyValues("spring.cloud.gateway.trusted-proxies=11\\.0\\.0\\..*")
222-
.run(context -> {
223-
assertThat(context).hasSingleBean(ForwardedHeadersFilter.class);
224-
});
217+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
218+
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
219+
.withPropertyValues("spring.cloud.gateway.trusted-proxies=11\\.0\\.0\\..*").run(context -> {
220+
assertThat(context).hasSingleBean(ForwardedHeadersFilter.class);
221+
});
225222
}
226223

227224
@Test
228225
public void trustedProxiesConditionDoesNotMatch() {
229226
new ReactiveWebApplicationContextRunner()
230-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
231-
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
232-
.run(context -> {
233-
assertThat(context).doesNotHaveBean(ForwardedHeadersFilter.class);
234-
});
227+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
228+
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
229+
.run(context -> {
230+
assertThat(context).doesNotHaveBean(ForwardedHeadersFilter.class);
231+
});
235232
}
236233

237234
@Test
238235
public void emptyTrustedProxiesFails() {
239236
Assertions.assertThatThrownBy(() -> new ForwardedHeadersFilter(""))
240-
.isInstanceOf(IllegalArgumentException.class);
237+
.isInstanceOf(IllegalArgumentException.class);
241238
}
242239

243240
@Test
244241
public void forwardedHeadersNotTrusted() throws Exception {
245242
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost/get")
246-
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
247-
.header(HttpHeaders.HOST, "myhost")
248-
.build();
243+
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
244+
.header(HttpHeaders.HOST, "myhost").build();
249245

250246
ForwardedHeadersFilter filter = new ForwardedHeadersFilter("11\\.0\\.0\\..*");
251247

@@ -258,10 +254,9 @@ public void forwardedHeadersNotTrusted() throws Exception {
258254
@Test
259255
public void untrustedForwardedForNotAppended() throws Exception {
260256
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost/get")
261-
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
262-
.header(HttpHeaders.HOST, "myhost")
263-
.header(FORWARDED_HEADER, "proto=http;host=myhost;for=\"127.0.0.1:80\",for=10.0.0.11")
264-
.build();
257+
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
258+
.header(HttpHeaders.HOST, "myhost")
259+
.header(FORWARDED_HEADER, "proto=http;host=myhost;for=\"127.0.0.1:80\",for=10.0.0.11").build();
265260

266261
ForwardedHeadersFilter filter = new ForwardedHeadersFilter("10\\.0\\.0\\..*");
267262

@@ -278,9 +273,8 @@ public void untrustedForwardedForNotAppended() throws Exception {
278273
@Test
279274
public void remoteAdddressIsNullUnTrustedProxyNotAppended() throws Exception {
280275
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/get")
281-
.header(HttpHeaders.HOST, "myhost")
282-
.header(FORWARDED_HEADER, "proto=http;host=myhost;for=127.0.0.1")
283-
.build();
276+
.header(HttpHeaders.HOST, "myhost").header(FORWARDED_HEADER, "proto=http;host=myhost;for=127.0.0.1")
277+
.build();
284278

285279
ForwardedHeadersFilter filter = new ForwardedHeadersFilter("10\\.0\\.0\\..*");
286280

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public void remoteAddressIsNull() throws Exception {
6161

6262
HttpHeaders headers = filter.filter(request.getHeaders(), MockServerWebExchange.from(request));
6363

64-
assertThat(headers).doesNotContainKeys(X_FORWARDED_FOR_HEADER)
65-
.containsKeys(X_FORWARDED_HOST_HEADER, X_FORWARDED_PORT_HEADER, X_FORWARDED_PROTO_HEADER);
64+
assertThat(headers).doesNotContainKeys(X_FORWARDED_FOR_HEADER).containsKeys(X_FORWARDED_HOST_HEADER,
65+
X_FORWARDED_PORT_HEADER, X_FORWARDED_PROTO_HEADER);
6666

6767
assertThat(headers.getFirst(X_FORWARDED_HOST_HEADER)).isEqualTo("localhost:8080");
6868
assertThat(headers.getFirst(X_FORWARDED_PORT_HEADER)).isEqualTo("8080");
@@ -322,36 +322,34 @@ public void nullValuesSkipped() throws Exception {
322322
@Test
323323
public void trustedProxiesConditionMatches() {
324324
new ReactiveWebApplicationContextRunner()
325-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
326-
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
327-
.withPropertyValues(GatewayProperties.PREFIX + ".trusted-proxies=11\\.0\\.0\\..*")
328-
.run(context -> {
329-
assertThat(context).hasSingleBean(XForwardedHeadersFilter.class);
330-
});
325+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
326+
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
327+
.withPropertyValues(GatewayProperties.PREFIX + ".trusted-proxies=11\\.0\\.0\\..*").run(context -> {
328+
assertThat(context).hasSingleBean(XForwardedHeadersFilter.class);
329+
});
331330
}
332331

333332
@Test
334333
public void trustedProxiesConditionDoesNotMatch() {
335334
new ReactiveWebApplicationContextRunner()
336-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
337-
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
338-
.run(context -> {
339-
assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class);
340-
});
335+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class,
336+
ReactiveWebServerFactoryAutoConfiguration.class, GatewayAutoConfiguration.class))
337+
.run(context -> {
338+
assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class);
339+
});
341340
}
342341

343342
@Test
344343
public void emptyTrustedProxiesFails() {
345344
Assertions.assertThatThrownBy(() -> new XForwardedHeadersFilter(""))
346-
.isInstanceOf(IllegalArgumentException.class);
345+
.isInstanceOf(IllegalArgumentException.class);
347346
}
348347

349348
@Test
350349
public void xForwardedHeadersNotTrusted() throws Exception {
351350
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/get")
352-
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
353-
.header(HttpHeaders.HOST, "myhost")
354-
.build();
351+
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
352+
.header(HttpHeaders.HOST, "myhost").build();
355353

356354
XForwardedHeadersFilter filter = new XForwardedHeadersFilter("11\\.0\\.0\\..*");
357355

@@ -366,11 +364,9 @@ public void xForwardedHeadersNotTrusted() throws Exception {
366364
@Test
367365
public void untrustedXForwardedForNotAppended() throws Exception {
368366
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/get")
369-
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
370-
.header(HttpHeaders.HOST, "myhost")
371-
.header(X_FORWARDED_FOR_HEADER, "127.0.0.1")
372-
.header(X_FORWARDED_FOR_HEADER, "10.0.0.10")
373-
.build();
367+
.remoteAddress(new InetSocketAddress(InetAddress.getByName("10.0.0.1"), 80))
368+
.header(HttpHeaders.HOST, "myhost").header(X_FORWARDED_FOR_HEADER, "127.0.0.1")
369+
.header(X_FORWARDED_FOR_HEADER, "10.0.0.10").build();
374370

375371
XForwardedHeadersFilter filter = new XForwardedHeadersFilter("10\\.0\\.0\\..*");
376372

@@ -379,16 +375,14 @@ public void untrustedXForwardedForNotAppended() throws Exception {
379375
assertThat(headers).containsKeys(X_FORWARDED_FOR_HEADER, X_FORWARDED_HOST_HEADER, X_FORWARDED_PORT_HEADER,
380376
X_FORWARDED_PROTO_HEADER);
381377

382-
assertThat(headers.getFirst(X_FORWARDED_FOR_HEADER)).doesNotContain("127.0.0.1")
383-
.contains("10.0.0.1", "10.0.0.10");
378+
assertThat(headers.getFirst(X_FORWARDED_FOR_HEADER)).doesNotContain("127.0.0.1").contains("10.0.0.1",
379+
"10.0.0.10");
384380
}
385381

386382
@Test
387383
public void remoteAdddressIsNullUnTrustedProxyNotAppended() {
388384
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/get")
389-
.header(HttpHeaders.HOST, "myhost")
390-
.header(X_FORWARDED_FOR_HEADER, "127.0.0.1")
391-
.build();
385+
.header(HttpHeaders.HOST, "myhost").header(X_FORWARDED_FOR_HEADER, "127.0.0.1").build();
392386

393387
XForwardedHeadersFilter filter = new XForwardedHeadersFilter("10\\.0\\.0\\..*");
394388

0 commit comments

Comments
 (0)