loggedInUser - 단순 기록용 insert 만 동작하도록 수정

This commit is contained in:
youngmok.kim
2025-05-31 10:00:11 +09:00
parent 8989e85edb
commit 8c8b868cc7
18 changed files with 50 additions and 409 deletions

View File

@@ -3,9 +3,6 @@ package app.module.admin.config.application.security;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.admin.usecase.loggedinuser.view.ports.LoggedInUserViewPortIn;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserView;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.MessageUtil;
@@ -29,84 +26,62 @@ import org.springframework.web.context.request.ServletRequestAttributes;
@Slf4j
public class AdminAuthSuccessEvent {
private final MessageUtil messageUtil;
private final AdminViewPortIn adminViewPortIn;
private final AdminUpdateLoginFailPortIn updateLoginFailPortIn;
private final LoggedInUserViewPortIn loggedInUserViewPortIn;
private final LoggedInUserSavePortIn loggedInUserSavePortIn;
@Value("${app.admin.password.validity.period.days}")
private long passwordValidPeriodDays;
@Value("${app.admin.password.change.notice.period.days}")
private long passwordChangeNoticeDays;
@Value("${app.admin.session.validity.period.seconds}")
private long sessionValidPeriodSeconds;
@Value("${app.admin.session.maximum.num}")
private Integer maxSessionNum;
private final MessageUtil messageUtil;
private final AdminViewPortIn adminViewPortIn;
private final AdminUpdateLoginFailPortIn updateLoginFailPortIn;
private final LoggedInUserSavePortIn loggedInUserSavePortIn;
@EventListener
public void handleAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
Authentication authentication = event.getAuthentication();
AdminUser adminUser = (AdminUser) authentication.getPrincipal();
@Value("${app.admin.password.validity.period.days}")
private long passwordValidPeriodDays;
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@Value("${app.admin.password.change.notice.period.days}")
private long passwordChangeNoticeDays;
// 로그인 실패 회수 초기화
adminViewPortIn
.connect(authentication.getName())
.ifPresent(admin -> updateLoginFailPortIn.connect(admin.getId(), 0));
@Value("${app.admin.session.validity.period.seconds}")
private long sessionValidPeriodSeconds;
// 패스워드 변경일 공지
if (passwordValidPeriodDays != -1
&& adminUser.getRemainPasswordDays() <= passwordChangeNoticeDays) {
CommonUtil.addFlashAlertMessages(
request.getSession(),
messageUtil.getMessage(
"security.password.change.notify", adminUser.getRemainPasswordDays()));
}
@Value("${app.admin.session.maximum.num}")
private Integer maxSessionNum;
if (maxSessionNum == 1) {
// 동시 접속 (중복 로그인) 여부 판단 후 사용자에게 메세지 보이기
if (isAlreadyLoggedInSomewhere(authentication.getName(),
CommonUtil.getClientIP(request))) {
CommonUtil.addFlashAlertMessages(
request.getSession(), messageUtil.getMessage("security.auth.duplicate.login"));
}
@EventListener
public void handleAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
Authentication authentication = event.getAuthentication();
AdminUser adminUser = (AdminUser) authentication.getPrincipal();
// 로그인 활성화 기록 생성
loggedInUserSavePortIn.connect(
LoggedInUserSaveCmd.builder()
.loggedInUserId(
LoggedInUserIdSaveCmd.builder()
.appType(AppType.ADMIN)
.id(authentication.getName())
.build())
.clientIP(CommonUtil.getClientIP(request))
.lastLoggedInAt(LocalDateTime.now())
.build());
}
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// 로그인 실패 회수 초기화
adminViewPortIn
.connect(authentication.getName())
.ifPresent(admin -> updateLoginFailPortIn.connect(admin.getId(), 0));
// 패스워드 변경일 공지
if (passwordValidPeriodDays != -1
&& adminUser.getRemainPasswordDays() <= passwordChangeNoticeDays) {
CommonUtil.addFlashAlertMessages(
request.getSession(),
messageUtil.getMessage(
"security.password.change.notify", adminUser.getRemainPasswordDays()));
}
@EventListener
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
Exception e = event.getException();
Authentication authentication = event.getAuthentication();
log.warn("Unsuccessful authentication result: {}", authentication, e);
}
// 로그인 활성화 기록 생성
loggedInUserSavePortIn.connect(
LoggedInUserSaveCmd.builder()
.loggedInUserId(
LoggedInUserIdSaveCmd.builder()
.appType(AppType.ADMIN)
.id(authentication.getName())
.build())
.clientIP(CommonUtil.getClientIP(request))
.lastLoggedInAt(LocalDateTime.now())
.build());
}
/**
* 사용자 로그인 여부 확인
*/
private boolean isAlreadyLoggedInSomewhere(String username, String currentIP) {
LoggedInUserView loggedInUser =
loggedInUserViewPortIn.connect(new LoggedInUserIdCmd(AppType.ADMIN, username));
if (loggedInUser == null) {
return false;
}
LocalDateTime lastLoggedInAt = loggedInUser.getLastLoggedInAt();
return lastLoggedInAt.plusSeconds(sessionValidPeriodSeconds).isAfter(LocalDateTime.now())
&& !currentIP.equals(loggedInUser.getClientIP());
}
@EventListener
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
Exception e = event.getException();
Authentication authentication = event.getAuthentication();
log.warn("Unsuccessful authentication result: {}", authentication, e);
}
}

View File

@@ -1,28 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.adapters.persistence;
import app.module.admin.usecase.loggedinuser.remove.adapters.persistence.model.LoggedInUserRemoveParam;
import app.module.admin.usecase.loggedinuser.remove.ports.LoggedInUserRemovePortOut;
import app.module.admin.usecase.loggedinuser.remove.ports.application.domain.LoggedInUserRemoveCmd;
import app.module.core.config.application.util.CommonUtil;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
public class LoggedInUserRemoveDao implements LoggedInUserRemovePortOut {
private final LoggedInUserRemoveMapper mapper;
@Override
public void connect(LoggedInUserRemoveCmd removeCommand) {
mapper.deleteByCompositeId(new LoggedInUserRemoveParam(
removeCommand.getAppType(),
removeCommand.getId(),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername()
));
}
}

View File

@@ -1,10 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.adapters.persistence;
import app.module.admin.usecase.loggedinuser.remove.adapters.persistence.model.LoggedInUserRemoveParam;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LoggedInUserRemoveMapper {
void deleteByCompositeId(LoggedInUserRemoveParam param);
}

View File

@@ -1,19 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.adapters.persistence.model;
import app.module.core.config.application.enums.AppType;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class LoggedInUserRemoveParam {
private AppType appType;
private String id;
private LocalDateTime updatedAt;
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
}

View File

@@ -1,8 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.ports;
import app.module.admin.usecase.loggedinuser.remove.ports.application.domain.LoggedInUserRemoveCmd;
public interface LoggedInUserRemovePortIn {
void connect(LoggedInUserRemoveCmd loggedInUserId);
}

View File

@@ -1,8 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.ports;
import app.module.admin.usecase.loggedinuser.remove.ports.application.domain.LoggedInUserRemoveCmd;
public interface LoggedInUserRemovePortOut {
void connect(LoggedInUserRemoveCmd removeCommand);
}

View File

@@ -1,19 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.ports.application;
import app.module.admin.usecase.loggedinuser.remove.ports.LoggedInUserRemovePortIn;
import app.module.admin.usecase.loggedinuser.remove.ports.LoggedInUserRemovePortOut;
import app.module.admin.usecase.loggedinuser.remove.ports.application.domain.LoggedInUserRemoveCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class LoggedInUserRemoveService implements LoggedInUserRemovePortIn {
private final LoggedInUserRemovePortOut portOut;
@Override
public void connect(LoggedInUserRemoveCmd removeCommand) {
portOut.connect(removeCommand);
}
}

View File

@@ -1,18 +0,0 @@
package app.module.admin.usecase.loggedinuser.remove.ports.application.domain;
import app.module.core.config.application.enums.AppType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LoggedInUserRemoveCmd {
private AppType appType;
private String id;
}

View File

@@ -2,10 +2,7 @@ package app.module.admin.usecase.loggedinuser.save.adapter.persistence;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.admin.usecase.loggedinuser.view.adapters.persistence.LoggedInUserViewMapper;
import app.module.admin.usecase.loggedinuser.view.adapters.persistence.model.LoggedInUserDto;
import app.module.core.config.adapters.persistence.entity.LoggedInUser;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -14,16 +11,10 @@ import org.springframework.stereotype.Repository;
public class LoggedInUserSaveDao implements LoggedInUserSavePortOut {
private final LoggedInUserSaveMapper mapper;
private final LoggedInUserViewMapper viewMapper;
@Override
public void connect(LoggedInUserSaveCmd saveCommand) {
Optional<LoggedInUserDto> existedLoggedInUser =
viewMapper.findByCompositeKey(
saveCommand.getLoggedInUserId().getAppType(),
saveCommand.getLoggedInUserId().getId());
LoggedInUser loggedInUser = new LoggedInUser(
saveCommand.getLoggedInUserId().getAppType(),
saveCommand.getLoggedInUserId().getId(),
@@ -31,10 +22,6 @@ public class LoggedInUserSaveDao implements LoggedInUserSavePortOut {
saveCommand.getLastLoggedInAt()
);
if (existedLoggedInUser.isPresent()) {
mapper.update(loggedInUser);
} else {
mapper.insert(loggedInUser);
}
mapper.insert(loggedInUser);
}
}

View File

@@ -1,26 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.adapters.persistence;
import app.module.admin.usecase.loggedinuser.view.adapters.persistence.model.LoggedInUserDto;
import app.module.admin.usecase.loggedinuser.view.ports.LoggedInUserViewPortOut;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserView;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
public class LoggedInUserViewDao implements LoggedInUserViewPortOut {
private final LoggedInUserViewMapper mapper;
@Override
public LoggedInUserView connect(LoggedInUserIdCmd userCommand) {
return mapper.findByCompositeKey(userCommand.getAppType(), userCommand.getId())
.map(d -> new LoggedInUserView(
new LoggedInUserIdCmd(d.getAppType(), d.getId()),
d.getClientIP(),
d.getLastLoggedInAt()
)).orElse(null);
}
}

View File

@@ -1,11 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.adapters.persistence;
import app.module.admin.usecase.loggedinuser.view.adapters.persistence.model.LoggedInUserDto;
import app.module.core.config.application.enums.AppType;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LoggedInUserViewMapper {
Optional<LoggedInUserDto> findByCompositeKey(AppType appType, String id);
}

View File

@@ -1,17 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.adapters.persistence.model;
import app.module.core.config.application.enums.AppType;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class LoggedInUserDto {
private AppType appType;
private String id;
private String clientIP;
private LocalDateTime lastLoggedInAt;
}

View File

@@ -1,9 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.ports;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserView;
public interface LoggedInUserViewPortIn {
LoggedInUserView connect(LoggedInUserIdCmd userCommand);
}

View File

@@ -1,9 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.ports;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserView;
public interface LoggedInUserViewPortOut {
LoggedInUserView connect(LoggedInUserIdCmd userCommand);
}

View File

@@ -1,20 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.ports.application;
import app.module.admin.usecase.loggedinuser.view.ports.LoggedInUserViewPortIn;
import app.module.admin.usecase.loggedinuser.view.ports.LoggedInUserViewPortOut;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserView;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class LoggedInUserViewService implements LoggedInUserViewPortIn {
private final LoggedInUserViewPortOut portOut;
@Override
public LoggedInUserView connect(LoggedInUserIdCmd userCommand) {
return portOut.connect(userCommand);
}
}

View File

@@ -1,16 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.ports.application.domain;
import app.module.core.config.application.enums.AppType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
@AllArgsConstructor
public class LoggedInUserIdCmd {
private AppType appType;
private String id;
}

View File

@@ -1,15 +0,0 @@
package app.module.admin.usecase.loggedinuser.view.ports.application.domain;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class LoggedInUserView {
private LoggedInUserIdCmd loggedInUserId;
private String clientIP;
private LocalDateTime lastLoggedInAt;
}

View File

@@ -1,88 +0,0 @@
package app.module.admin.config.security;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated;
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated;
import app.module.admin.usecase.loggedinuser.view.ports.LoggedInUserViewPortOut;
import app.module.admin.usecase.loggedinuser.view.ports.application.domain.LoggedInUserIdCmd;
import app.module.core.config.application.enums.AppType;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import java.util.Arrays;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.web.servlet.MockMvc;
@SpringBootTest
@TestPropertySource("classpath:application-override.properties")
@AutoConfigureMockMvc
@TestInstance(Lifecycle.PER_CLASS)
class AdminAuthSuccessHandlerTest {
static {
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
}
@Autowired
MockMvc mockMvc;
@Autowired
AdminViewPortIn adminViewPortIn;
@Autowired
LoggedInUserViewPortOut loggedInUserViewPortOut;
@Autowired
SaveAdminPortIn saveAdminPortIn;
String username = "admin_for_initFailCnt_aspect_test";
String password = "test.1@#$";
@Value("${app.admin.session.maximum.num}")
private Integer maxSessionNum;
@BeforeAll
public void beforeAll() {
saveAdminPortIn.connect(
1L,
username,
password,
"admin_for_createDao_test@test.com",
false,
false,
Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));
}
@Test
void onAuthenticationSuccess() throws Exception {
String badPassword = "bad-password.1@#$";
mockMvc.perform(formLogin().user(username).password(badPassword))
.andExpect(unauthenticated());
assertEquals(
1,
adminViewPortIn.connect(username).orElseThrow().getLoginFailCnt(),
"로그인 실패시 실패회수가 1증가 해야한다.");
mockMvc.perform(formLogin().user(username).password(password)).andExpect(authenticated());
assertEquals(
0,
adminViewPortIn.connect(username).orElseThrow().getLoginFailCnt(),
"로그인 성공시 실패회수가 0으로 초기화 되야한다.");
if (maxSessionNum == 1) {
assertNotNull(
loggedInUserViewPortOut.connect(
LoggedInUserIdCmd.builder().appType(AppType.ADMIN).id(username).build()),
"maxSessionNum 이 1일때, 로그인 기록 레코드가 생성되어야 한다.");
}
}
}