Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson 2015-02-19 11:24:51 +00:00
commit 6253cc5dc7
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
View File

@ -69,13 +69,14 @@ public class AuthenticationManagerConfiguration {
@Bean
@Primary
public AuthenticationManager authenticationManager(AuthenticationConfiguration auth) throws Exception {
public AuthenticationManager authenticationManager(AuthenticationConfiguration auth)
throws Exception {
return auth.getAuthenticationManager();
}
@Bean
public static BootDefaultingAuthenticationConfigurerAdapter bootDefaultingAuthenticationConfigurerAdapter(SecurityProperties security,
List<SecurityPrerequisite> dependencies) {
public static BootDefaultingAuthenticationConfigurerAdapter bootDefaultingAuthenticationConfigurerAdapter(
SecurityProperties security, List<SecurityPrerequisite> dependencies) {
return new BootDefaultingAuthenticationConfigurerAdapter(security);
}
@ -126,7 +127,8 @@ public class AuthenticationManagerConfiguration {
* </ul>
*/
@Order(Ordered.LOWEST_PRECEDENCE - 100)
private static class BootDefaultingAuthenticationConfigurerAdapter extends GlobalAuthenticationConfigurerAdapter {
private static class BootDefaultingAuthenticationConfigurerAdapter extends
GlobalAuthenticationConfigurerAdapter {
private final SecurityProperties security;
@Autowired
@ -134,6 +136,7 @@ public class AuthenticationManagerConfiguration {
this.security = security;
}
@Override
public void init(AuthenticationManagerBuilder auth) throws Exception {
if (auth.isConfigured()) {
return;
@ -144,12 +147,13 @@ public class AuthenticationManagerConfiguration {
logger.info("\n\nUsing default security password: " + user.getPassword()
+ "\n");
}
Set<String> roles = new LinkedHashSet<String>(user.getRole());
auth
.inMemoryAuthentication()
.withUser(user.getName())
.password(user.getPassword())
.roles(roles.toArray(new String[roles.size()]));
auth.inMemoryAuthentication().withUser(user.getName())
.password(user.getPassword())
.roles(roles.toArray(new String[roles.size()]));
}
}
}
}