admin/cmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

62. Validate user login (#6)

Browse Source
This commit is contained in:
Art
2021-09-08 15:26:22 +03:00
parent 6945bcef59
commit f65fe530e5
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/GuavaCacheLoginAttemptService.java
View File

@ -31,7 +31,7 @@ public class GuavaCacheLoginAttemptService implements LoginAttemptService {
@Override @Override
public void loginSucceeded(String username) { public void loginSucceeded(String username) {
loginAttemptsCache.invalidate(username); evictUserFromCache(username);
} }
@Override @Override
@ -39,6 +39,11 @@ public class GuavaCacheLoginAttemptService implements LoginAttemptService {
return getAttempts(username) >= MAX_ATTEMPTS; return getAttempts(username) >= MAX_ATTEMPTS;
} }
@Override
public void evictUserFromCache(String username) {
loginAttemptsCache.invalidate(username);
}
private int getAttempts(String username) { private int getAttempts(String username) {
Integer attempts = loginAttemptsCache.getIfPresent(username); Integer attempts = loginAttemptsCache.getIfPresent(username);
return Objects.requireNonNullElse(attempts, 0); return Objects.requireNonNullElse(attempts, 0);

5
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/LoginAttemptService.java
View File

@ -2,8 +2,8 @@ package net.shyshkin.study.fullstack.supportportal.backend.service;
public interface LoginAttemptService { public interface LoginAttemptService {
static final int MAX_ATTEMPTS = 5; int MAX_ATTEMPTS = 5;
static final int ATTEMPT_INCREMENT = 1; int ATTEMPT_INCREMENT = 1;
void loginFailed(String username); void loginFailed(String username);
@ -11,4 +11,5 @@ public interface LoginAttemptService {
boolean hasExceededMaxAttempts(String username); boolean hasExceededMaxAttempts(String username);
void evictUserFromCache(String username);
} }

11
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java
View File

@ -36,6 +36,7 @@ public class UserServiceImpl implements UserService {
private final UserRepository userRepository; private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder; private final PasswordEncoder passwordEncoder;
private final LoginAttemptService loginAttemptService;
@Override @Override
@Transactional @Transactional
@ -43,11 +44,21 @@ public class UserServiceImpl implements UserService {
User user = userRepository User user = userRepository
.findByUsername(username) .findByUsername(username)
.orElseThrow(() -> new UsernameNotFoundException(String.format(USERNAME_NOT_FOUND_MSG, username))); .orElseThrow(() -> new UsernameNotFoundException(String.format(USERNAME_NOT_FOUND_MSG, username)));
validateLoginAttempts(user);
user.setLastLoginDateDisplay(user.getLastLoginDate()); user.setLastLoginDateDisplay(user.getLastLoginDate());
user.setLastLoginDate(LocalDateTime.now()); user.setLastLoginDate(LocalDateTime.now());
return new UserPrincipal(user); return new UserPrincipal(user);
} }
private void validateLoginAttempts(User user) {
if (user.isNotLocked()) {
if (loginAttemptService.hasExceededMaxAttempts(user.getUsername()))
user.setNotLocked(false);
} else {
loginAttemptService.evictUserFromCache(user.getUsername());
}
}
@Override @Override
public User register(String firstName, String lastName, String username, String email) { public User register(String firstName, String lastName, String username, String email) {