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

Refactor EndpointPathRequestMatcher 

Refactor `EndpointPathRequestMatcher` so that the side effect of setting
`endpointHandlerMapping` in the parent class is a little more obvious.
This commit is contained in:
Phillip Webb 2015-07-06 22:14:46 -07:00
parent c8137ef3f8
commit 4c8c376829
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
View File

@ -76,7 +76,6 @@ import org.springframework.util.StringUtils;
* Many aspects of the behavior can be controller with {@link ManagementServerProperties} * Many aspects of the behavior can be controller with {@link ManagementServerProperties}
* via externalized application properties (or via an bean definition of that type to set * via externalized application properties (or via an bean definition of that type to set
* the defaults). * the defaults).
*
* <p> * <p>
* The framework {@link Endpoint}s (used to expose application information to operations) * The framework {@link Endpoint}s (used to expose application information to operations)
* include a {@link Endpoint#isSensitive() sensitive} configuration option which will be * include a {@link Endpoint#isSensitive() sensitive} configuration option which will be
@ -231,6 +230,22 @@ public class ManagementSecurityAutoConfiguration {
this.endpointHandlerMapping = endpointHandlerMapping; this.endpointHandlerMapping = endpointHandlerMapping;
} }
protected final void deduceEndpointHandlerMappingIfMissing() {
if (this.endpointHandlerMapping == null) {
ApplicationContext context = (this.contextResolver == null ? null
: this.contextResolver.getApplicationContext());
if (context != null
&& context.getBeanNamesForType(EndpointHandlerMapping.class).length > 0) {
this.endpointHandlerMapping = context
.getBean(EndpointHandlerMapping.class);
}
if (this.endpointHandlerMapping == null) {
this.endpointHandlerMapping = new EndpointHandlerMapping(
Collections.<MvcEndpoint> emptySet());
}
}
}
@Override @Override
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {
// secure endpoints // secure endpoints
@ -297,35 +312,32 @@ public class ManagementSecurityAutoConfiguration {
@Override @Override
public boolean matches(HttpServletRequest request) { public boolean matches(HttpServletRequest request) {
EndpointHandlerMapping endpointMapping = ManagementWebSecurityConfigurerAdapter.this.endpointHandlerMapping; ManagementWebSecurityConfigurerAdapter.this
if (endpointMapping == null .deduceEndpointHandlerMappingIfMissing();
&& ManagementWebSecurityConfigurerAdapter.this.contextResolver != null) {
ApplicationContext context = ManagementWebSecurityConfigurerAdapter.this.contextResolver
.getApplicationContext();
if (context != null
&& context.getBeanNamesForType(EndpointHandlerMapping.class).length > 0) {
ManagementWebSecurityConfigurerAdapter.this.endpointHandlerMapping = context
.getBean(EndpointHandlerMapping.class);
}
}
if (endpointMapping == null) {
ManagementWebSecurityConfigurerAdapter.this.endpointHandlerMapping = new EndpointHandlerMapping(
Collections.<MvcEndpoint> emptySet());
}
if (this.delegate == null) { if (this.delegate == null) {
List<RequestMatcher> pathMatchers = new ArrayList<RequestMatcher>(); this.delegate = createDelegate();
String[] paths = !this.sensitive ? getEndpointPaths(endpointMapping,
false) : getEndpointPaths(endpointMapping);
for (String path : paths) {
pathMatchers.add(new AntPathRequestMatcher(
ManagementWebSecurityConfigurerAdapter.this.server
.getPath(path)));
}
this.delegate = pathMatchers.isEmpty() ? AnyRequestMatcher.INSTANCE
: new OrRequestMatcher(pathMatchers);
} }
return this.delegate.matches(request); return this.delegate.matches(request);
} }
private RequestMatcher createDelegate() {
ServerProperties server = ManagementWebSecurityConfigurerAdapter.this.server;
List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
for (String path : getPaths()) {
matchers.add(new AntPathRequestMatcher(server.getPath(path)));
}
return (matchers.isEmpty() ? AnyRequestMatcher.INSTANCE
: new OrRequestMatcher(matchers));
}
private String[] getPaths() {
EndpointHandlerMapping endpointHandlerMapping = ManagementWebSecurityConfigurerAdapter.this.endpointHandlerMapping;
if (this.sensitive) {
return getEndpointPaths(endpointHandlerMapping);
}
return getEndpointPaths(endpointHandlerMapping, false);
}
} }
} }