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

Pin order to of crsh auto configuration to happen after any security related configuration 

If crsh auto configuration happens too early a AuthenticationManager contributed by SecurityAutoConfiguration will not be detected
This commit is contained in:
Christian Dupuis 2013-11-21 18:04:57 +01:00
parent 61dd7d1dbb
commit cd89691726
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
View File

@ -58,6 +58,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -119,7 +120,8 @@ import org.springframework.util.StringUtils;
@Configuration
@ConditionalOnClass({ PluginLifeCycle.class })
@EnableConfigurationProperties({ ShellProperties.class })
@AutoConfigureAfter(ManagementSecurityAutoConfiguration.class)
@AutoConfigureAfter({ SecurityAutoConfiguration.class,
ManagementSecurityAutoConfiguration.class })
public class CrshAutoConfiguration {
@Autowired
@ -182,7 +184,8 @@ public class CrshAutoConfiguration {
@ConditionalOnMissingBean({ CrshShellAuthenticationProperties.class })
public CrshShellAuthenticationProperties springAuthenticationProperties() {
// In case no shell.auth property is provided fall back to Spring Security
// based authentication and get role to access shell from SecurityProperties.
// based authentication and get role to access shell from
// ManagementServerProperties.
SpringAuthenticationProperties authenticationProperties = new SpringAuthenticationProperties();
if (this.management != null) {
authenticationProperties.setRoles(new String[] { this.management