필요없는 파일 삭제 및 이동
This commit is contained in:
@@ -1,11 +1,6 @@
|
||||
package app.module.admin.config.application.aop;
|
||||
|
||||
import app.module.core.config.application.enums.AppType;
|
||||
import app.module.core.config.application.enums.OperationLogType;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
@@ -18,21 +13,12 @@ import org.springframework.stereotype.Component;
|
||||
@RequiredArgsConstructor
|
||||
public class LoginFailAspect {
|
||||
|
||||
private final OperationLogSavePortIn operationLogSavePortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@After("@annotation(app.module.admin.config.application.aop.LoginFailOperateLog)")
|
||||
public void operate(JoinPoint joinPoint) throws Throwable {
|
||||
Object[] args = joinPoint.getArgs();
|
||||
HttpServletRequest request = (HttpServletRequest) args[0];
|
||||
String targetId = request.getParameter("username");
|
||||
|
||||
operationLogSavePortIn.connect(
|
||||
new OperationLogSaveCommand(
|
||||
AppType.ADMIN,
|
||||
OperationLogType.LOGIN_FAIL,
|
||||
targetId,
|
||||
CommonUtil.getClientIP(request),
|
||||
messageUtil.getMessage("operate.login.fail", targetId)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@ import app.module.core.config.application.enums.AppType;
|
||||
import app.module.core.config.application.enums.OperationLogType;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -20,8 +18,6 @@ import org.springframework.stereotype.Component;
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class LoginSuccessAspect {
|
||||
|
||||
private final OperationLogSavePortIn operationLogSavePortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@After("@annotation(app.module.admin.config.application.aop.LoginSuccessOperateLog)")
|
||||
@@ -31,12 +27,5 @@ public class LoginSuccessAspect {
|
||||
HttpServletRequest request = (HttpServletRequest) args[0];
|
||||
Authentication authentication = (Authentication) args[2];
|
||||
|
||||
operationLogSavePortIn.connect(
|
||||
new OperationLogSaveCommand(
|
||||
AppType.ADMIN,
|
||||
OperationLogType.LOGIN_SUCCESS,
|
||||
null,
|
||||
CommonUtil.getClientIP(request),
|
||||
messageUtil.getMessage("operate.login.success", authentication.getName())));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,8 +5,6 @@ import app.module.core.config.application.enums.OperationLogType;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
@@ -27,7 +25,6 @@ import java.util.Optional;
|
||||
public class RoleUpdateAspect {
|
||||
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
private final OperationLogSavePortIn operationLogSavePortIn;
|
||||
|
||||
@Around(
|
||||
"execution(* app.module.core.usecase.admin.saveAdmin.ports.application.SaveAdminService.connect(..))")
|
||||
@@ -54,34 +51,7 @@ public class RoleUpdateAspect {
|
||||
// .map(adminUserWithRole -> adminUserWithRole.getRole().getId())
|
||||
// .collect(Collectors.toList());
|
||||
|
||||
boolean createLog = false;
|
||||
|
||||
if (beforeAdmin.isPresent()) {
|
||||
List<String> beforeRoles =
|
||||
beforeAdmin.stream().map(r -> r.getRole().getId()).toList();
|
||||
if (beforeRoles.size() != currentRoles.size()
|
||||
|| currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) {
|
||||
createLog = true;
|
||||
}
|
||||
} else if (!currentRoles.isEmpty()) {
|
||||
createLog = true;
|
||||
}
|
||||
|
||||
if (createLog) {
|
||||
String operatorId = Optional.ofNullable(CommonUtil.getLoginUsername())
|
||||
.orElse("init data");
|
||||
HttpServletRequest request = CommonUtil.getRequest();
|
||||
|
||||
operationLogSavePortIn.connect(
|
||||
new OperationLogSaveCommand(
|
||||
AppType.ADMIN,
|
||||
OperationLogType.ROLE_UPDATE,
|
||||
adminId,
|
||||
request != null ? CommonUtil.getClientIP(request) : null,
|
||||
String.format(
|
||||
"`%s` grants [%s] permissions to `%s`",
|
||||
operatorId, StringUtils.join(currentRoles, ", "), adminId)));
|
||||
}
|
||||
|
||||
return joinPoint.proceed();
|
||||
}
|
||||
|
||||
@@ -7,8 +7,6 @@ import app.module.core.config.application.util.MessageUtil;
|
||||
import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortIn;
|
||||
import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -31,7 +29,6 @@ public class AdminAuthFailEvent {
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
private final AdminUpdateLoginFailPortIn updateLoginFailPortIn;
|
||||
private final AdminUpdateAccountLockPortIn updateAccountLockPortIn;
|
||||
private final OperationLogSavePortIn operationLogSavePortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
@Value("${app.admin.auth.fail.permit}")
|
||||
private int failPermit;
|
||||
@@ -61,15 +58,6 @@ public class AdminAuthFailEvent {
|
||||
request.getSession(),
|
||||
messageUtil.getMessage("security.auth.fail.exceed", failPermit));
|
||||
|
||||
// 계정 잠금 로그 기록
|
||||
operationLogSavePortIn.connect(
|
||||
new OperationLogSaveCommand(
|
||||
AppType.ADMIN,
|
||||
OperationLogType.ACCOUNT_LOCKED,
|
||||
adminUserViewInfo.getId(),
|
||||
CommonUtil.getClientIP(request),
|
||||
messageUtil.getMessage(
|
||||
"operate.account.locked", adminUserViewInfo.getId())));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import app.module.core.usecase.file.model.UploadFile;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -9,7 +10,7 @@ import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile}
|
||||
* DTO for {@link UploadFile}
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
package app.module.admin;
|
||||
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.web.filter.CharacterEncodingFilter;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* MockMvc `application/json` 타입 전송 시 UTF-8 설정 어노테이션
|
||||
*
|
||||
* @author Youngmok Kim
|
||||
* @version 1.0 2022-06-27
|
||||
*/
|
||||
@Target(ElementType.TYPE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Documented
|
||||
@AutoConfigureMockMvc
|
||||
@Import(EnableJsonUTF8.Config.class)
|
||||
public @interface EnableJsonUTF8 {
|
||||
|
||||
class Config {
|
||||
|
||||
@Bean
|
||||
public CharacterEncodingFilter characterEncodingFilter() {
|
||||
return new CharacterEncodingFilter("UTF-8", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
package app.module.admin.config.initData;
|
||||
|
||||
import app.module.core.config.adapters.persistence.repository.RoleRepo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.boot.ApplicationArguments;
|
||||
import org.springframework.boot.ApplicationRunner;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class InitAdminUserRoleTestData implements ApplicationRunner {
|
||||
|
||||
private final RoleRepo roleRepo;
|
||||
private final Environment env;
|
||||
|
||||
@Override
|
||||
public void run(ApplicationArguments args) {
|
||||
if (!env.getProperty("admin.initData.test", Boolean.class)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// roleRepo.save(new Role("ROLE_SUPER"));
|
||||
// roleRepo.save(new Role("ROLE_STAFF"));
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package app.module.admin.config.security;
|
||||
|
||||
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
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;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
|
||||
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated;
|
||||
|
||||
@SpringBootTest
|
||||
@TestPropertySource("classpath:application-override.properties")
|
||||
@AutoConfigureMockMvc
|
||||
@TestInstance(Lifecycle.PER_CLASS)
|
||||
class AdminAuthFailHandlerTest {
|
||||
|
||||
static {
|
||||
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
MockMvc mockMvc;
|
||||
@Autowired
|
||||
AdminViewPortIn adminViewPortIn;
|
||||
@Autowired
|
||||
SaveAdminPortIn saveAdminPortIn;
|
||||
|
||||
@Value("${app.admin.auth.fail.permit}")
|
||||
Integer loginFailPermit;
|
||||
|
||||
String testUsername = "testUser";
|
||||
|
||||
@BeforeAll
|
||||
public void beforeAll() {
|
||||
/* saveAdminPortIn.connect(
|
||||
1L,
|
||||
testUsername,
|
||||
"test.1@#$",
|
||||
null,
|
||||
false,
|
||||
Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - 계정 잠김")
|
||||
void onAuthenticationFailure() throws Exception {
|
||||
String badPassword = "bad-password.1@#$";
|
||||
String goodPassword = "test.1@#$";
|
||||
|
||||
for (int i = 0; i < loginFailPermit; i++) {
|
||||
mockMvc.perform(formLogin().user(testUsername).password(badPassword));
|
||||
}
|
||||
|
||||
assertTrue(
|
||||
adminViewPortIn.connect(testUsername).orElseThrow().getAccountLocked(),
|
||||
String.format("%s 회 이상 로그인 실패로 계정이 잠김처리되어야 한다.", loginFailPermit));
|
||||
|
||||
mockMvc
|
||||
.perform(formLogin().user(testUsername).password(goodPassword))
|
||||
.andExpect(unauthenticated());
|
||||
}
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
package app.module.admin.config.security;
|
||||
|
||||
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
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.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;
|
||||
|
||||
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;
|
||||
|
||||
@SpringBootTest
|
||||
@TestPropertySource("classpath:application-override.properties")
|
||||
@AutoConfigureMockMvc
|
||||
@TestInstance(Lifecycle.PER_CLASS)
|
||||
class AdminDetailsServiceTest {
|
||||
|
||||
static {
|
||||
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
MockMvc mockMvc;
|
||||
@Autowired
|
||||
SaveAdminPortIn saveAdminPortIn;
|
||||
|
||||
String username = "test";
|
||||
String password = "test.1@#$";
|
||||
String oldUsername = "admin_for_old_password_test";
|
||||
|
||||
@BeforeAll
|
||||
public void beforeAll() {
|
||||
/* saveAdminPortIn.connect(
|
||||
1L,
|
||||
username,
|
||||
password,
|
||||
null,
|
||||
false,
|
||||
Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - 로그인 성공")
|
||||
void operate1() throws Exception {
|
||||
mockMvc.perform(formLogin().user(username).password(password)).andExpect(authenticated());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - 로그인 실패")
|
||||
void operate2() throws Exception {
|
||||
String badPassword = "bad-password.1@#$";
|
||||
mockMvc.perform(formLogin().user(username).password(badPassword))
|
||||
.andExpect(unauthenticated());
|
||||
}
|
||||
|
||||
// @Test
|
||||
// @DisplayName("operate - 패스워드 유효기간 지남")
|
||||
// void operate3() throws Exception {
|
||||
//
|
||||
// mockMvc.perform(formLogin().user(oldUsername).password(password)).andExpect(unauthenticated());
|
||||
// }
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
package app.module.admin.feature.admin.repository.dao;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
|
||||
|
||||
@Slf4j
|
||||
class AdminCreateUpdateDaoTest {
|
||||
|
||||
static {
|
||||
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
|
||||
}
|
||||
|
||||
/* @Autowired
|
||||
SaveAdminPortOut adminCreateUpdateDao;
|
||||
@Autowired
|
||||
AdminViewPortIn adminViewPortIn;
|
||||
@Autowired
|
||||
SaveAdminPortIn saveAdminPortIn;*/
|
||||
|
||||
@Test
|
||||
@DisplayName("operate - AdminCreateDao")
|
||||
void operate() {
|
||||
|
||||
/* saveAdminPortIn.connect(
|
||||
1L,
|
||||
"admin_for_createDao_test",
|
||||
"test.1@#$",
|
||||
null,
|
||||
false,
|
||||
Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));
|
||||
|
||||
adminViewPortIn
|
||||
.connect("admin_for_createDao_test")
|
||||
.ifPresent(
|
||||
retrieveUser ->
|
||||
assertEquals(
|
||||
Arrays.asList("ROLE_SUPER", "ROLE_STAFF").size(),
|
||||
retrieveUser.getRoles().size()));
|
||||
|
||||
saveAdminPortIn.connect(
|
||||
2L,
|
||||
"admin_for_createDao_test",
|
||||
"test.1@#$",
|
||||
null,
|
||||
false,
|
||||
List.of("ROLE_STAFF"));
|
||||
assertEquals(
|
||||
1,
|
||||
adminViewPortIn.connect("admin_for_createDao_test").orElseThrow().getRoles().size(),
|
||||
"기존 권한들을 (내부적으로) 삭제하고 새로이 추가 등록되기에 withRoles 의 size 는 1이다.");*/
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
# disable JNDI lookup
|
||||
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration
|
||||
spring.profiles.active=local
|
||||
spring.jpa.hibernate.ddl-auto=create
|
||||
spring.datasource.url=jdbc:h2:~/test;
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=
|
||||
spring.datasource.driver-class-name=org.h2.Driver
|
||||
spring.jpa.properties.hibernate.show_sql=true
|
||||
logging.level.org.hibernate.type.descriptor.sql=trace
|
||||
admin.initData.test=true
|
||||
Reference in New Issue
Block a user