fix misconfigured authentication manager
This commit is contained in:
@@ -458,6 +458,14 @@ public class PermissionManager implements UserDataProvider {
|
||||
return permissions;
|
||||
}
|
||||
|
||||
public void cleanupPermissionStart() {
|
||||
for (Permission permission : permissionRepository.findAll(qPermission.expires.after(Instant.now())
|
||||
.and(qPermission.starts.isNotNull().and(qPermission.starts.before(Instant.now()))))) {
|
||||
permission.setStarts(null);
|
||||
permissionRepository.save(permission);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* @see de.bstly.we.businesslogic.UserDataProvider#getId()
|
||||
*/
|
||||
|
||||
@@ -50,14 +50,18 @@ public class PermissionManagementController extends BaseController {
|
||||
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
||||
@GetMapping("/{username}")
|
||||
public List<Permission> getPermissionsForUser(@PathVariable("username") String username,
|
||||
@RequestParam("sort") Optional<String> sort) {
|
||||
@RequestParam("sort") Optional<String> sort, @RequestParam("ignoreStart") Optional<Boolean> ignoreStart) {
|
||||
User user = userManager.getByUsername(username);
|
||||
|
||||
if (user == null) {
|
||||
throw new EntityResponseStatusException(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
|
||||
return permissionManager.getNotExpiresByTargetIgnoreStart(user.getId(), sort.orElse(null));
|
||||
if (ignoreStart.orElse(true)) {
|
||||
return permissionManager.getNotExpiresByTargetIgnoreStart(user.getId(), sort.orElse(null));
|
||||
} else {
|
||||
return permissionManager.getNotExpiresByTarget(user.getId(), sort.orElse(null));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -84,18 +84,6 @@ public class SecurityConfig {
|
||||
|
||||
public static final String KEEP_PARAM = "keep";
|
||||
|
||||
/**
|
||||
* Configure authentication.
|
||||
*
|
||||
* @param auth the auth
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Autowired
|
||||
public void configureAuthentication(AuthenticationManagerBuilder auth) throws Exception {
|
||||
localAuthenticationProvider.setPasswordEncoder(passwordEncoder);
|
||||
auth.authenticationProvider(localAuthenticationProvider);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
||||
http
|
||||
@@ -209,8 +197,12 @@ public class SecurityConfig {
|
||||
|
||||
@Bean
|
||||
public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
|
||||
return http.getSharedObject(AuthenticationManagerBuilder.class).userDetailsService(localUserDetailsService)
|
||||
.passwordEncoder(passwordEncoder).and().build();
|
||||
AuthenticationManagerBuilder authenticationManagerBuilder = http
|
||||
.getSharedObject(AuthenticationManagerBuilder.class);
|
||||
localAuthenticationProvider.setUserDetailsService(localUserDetailsService);
|
||||
localAuthenticationProvider.setPasswordEncoder(passwordEncoder);
|
||||
authenticationManagerBuilder.authenticationProvider(localAuthenticationProvider);
|
||||
return authenticationManagerBuilder.build();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user