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

Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson 2018-12-03 13:01:56 +00:00
parent b05abe8ca0 07065532fe
commit 0f474ec08f
2 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java
View File

@ -19,7 +19,6 @@ package org.springframework.boot.actuate.autoconfigure.security.servlet;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.testcontainers.shaded.org.apache.http.HttpStatus;
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
@ -32,6 +31,7 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
@ -63,26 +63,26 @@ public class ManagementWebSecurityAutoConfigurationTests {
@Test @Test
public void permitAllForHealth() { public void permitAllForHealth() {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {
int status = getResponseStatus(context, "/actuator/health"); HttpStatus status = getResponseStatus(context, "/actuator/health");
assertThat(status).isEqualTo(HttpStatus.SC_OK); assertThat(status).isEqualTo(HttpStatus.OK);
}); });
} }
@Test @Test
public void permitAllForInfo() { public void permitAllForInfo() {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {
int status = getResponseStatus(context, "/actuator/info"); HttpStatus status = getResponseStatus(context, "/actuator/info");
assertThat(status).isEqualTo(HttpStatus.SC_OK); assertThat(status).isEqualTo(HttpStatus.OK);
}); });
} }
@Test @Test
public void securesEverythingElse() { public void securesEverythingElse() {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {
int status = getResponseStatus(context, "/actuator"); HttpStatus status = getResponseStatus(context, "/actuator");
assertThat(status).isEqualTo(HttpStatus.SC_UNAUTHORIZED); assertThat(status).isEqualTo(HttpStatus.UNAUTHORIZED);
status = getResponseStatus(context, "/foo"); status = getResponseStatus(context, "/foo");
assertThat(status).isEqualTo(HttpStatus.SC_UNAUTHORIZED); assertThat(status).isEqualTo(HttpStatus.UNAUTHORIZED);
}); });
} }
@ -90,8 +90,8 @@ public class ManagementWebSecurityAutoConfigurationTests {
public void usesMatchersBasedOffConfiguredActuatorBasePath() { public void usesMatchersBasedOffConfiguredActuatorBasePath() {
this.contextRunner.withPropertyValues("management.endpoints.web.base-path=/") this.contextRunner.withPropertyValues("management.endpoints.web.base-path=/")
.run((context) -> { .run((context) -> {
int status = getResponseStatus(context, "/health"); HttpStatus status = getResponseStatus(context, "/health");
assertThat(status).isEqualTo(HttpStatus.SC_OK); assertThat(status).isEqualTo(HttpStatus.OK);
}); });
} }
@ -99,15 +99,15 @@ public class ManagementWebSecurityAutoConfigurationTests {
public void backOffIfCustomSecurityIsAdded() { public void backOffIfCustomSecurityIsAdded() {
this.contextRunner.withUserConfiguration(CustomSecurityConfiguration.class) this.contextRunner.withUserConfiguration(CustomSecurityConfiguration.class)
.run((context) -> { .run((context) -> {
int status = getResponseStatus(context, "/actuator/health"); HttpStatus status = getResponseStatus(context, "/actuator/health");
assertThat(status).isEqualTo(HttpStatus.SC_UNAUTHORIZED); assertThat(status).isEqualTo(HttpStatus.UNAUTHORIZED);
status = getResponseStatus(context, "/foo"); status = getResponseStatus(context, "/foo");
assertThat(status).isEqualTo(HttpStatus.SC_OK); assertThat(status).isEqualTo(HttpStatus.OK);
}); });
} }
private int getResponseStatus(AssertableWebApplicationContext context, String path) private HttpStatus getResponseStatus(AssertableWebApplicationContext context,
throws IOException, javax.servlet.ServletException { String path) throws IOException, javax.servlet.ServletException {
FilterChainProxy filterChainProxy = context.getBean(FilterChainProxy.class); FilterChainProxy filterChainProxy = context.getBean(FilterChainProxy.class);
MockServletContext servletContext = new MockServletContext(); MockServletContext servletContext = new MockServletContext();
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
@ -117,7 +117,7 @@ public class ManagementWebSecurityAutoConfigurationTests {
request.setServletPath(path); request.setServletPath(path);
request.setMethod("GET"); request.setMethod("GET");
filterChainProxy.doFilter(request, response, new MockFilterChain()); filterChainProxy.doFilter(request, response, new MockFilterChain());
return response.getStatus(); return HttpStatus.valueOf(response.getStatus());
} }
@Configuration @Configuration

20
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -824,31 +824,16 @@
<artifactId>metrics-jdbi</artifactId> <artifactId>metrics-jdbi</artifactId>
<version>${dropwizard-metrics.version}</version> <version>${dropwizard-metrics.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jersey</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jersey2</artifactId> <artifactId>metrics-jersey2</artifactId>
<version>${dropwizard-metrics.version}</version> <version>${dropwizard-metrics.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jetty8</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jetty9</artifactId> <artifactId>metrics-jetty9</artifactId>
<version>${dropwizard-metrics.version}</version> <version>${dropwizard-metrics.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jetty9-legacy</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId> <artifactId>metrics-jmx</artifactId>
@ -864,11 +849,6 @@
<artifactId>metrics-jvm</artifactId> <artifactId>metrics-jvm</artifactId>
<version>${dropwizard-metrics.version}</version> <version>${dropwizard-metrics.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-log4j</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-log4j2</artifactId> <artifactId>metrics-log4j2</artifactId>