From 060a8af93ab692007c3bcbfecb4888c6b07dc21f Mon Sep 17 00:00:00 2001 From: ChungA1010 Date: Tue, 17 Nov 2026 04:18:02 +0900 Subject: [PATCH] feat: add admin action audit logging --- .../domain/adminActionLog/AdminAction.java | 18 +++++ .../domain/adminActionLog/AdminActionLog.java | 56 ++++++++++++++ .../AdminActionLogBodyAdvice.java | 40 ++++++++++ .../AdminActionLogController.java | 70 +++++++++++++++++ .../AdminActionLogInterceptor.java | 65 ++++++++++++++++ .../adminActionLog/AdminActionLogQuery.java | 37 +++++++++ .../AdminActionLogQueryRepository.java | 76 +++++++++++++++++++ .../AdminActionLogRepository.java | 6 ++ .../AdminActionLogWebConfig.java | 19 +++++ .../adminActionLog/AdminActionLogWriter.java | 57 ++++++++++++++ .../adminActionLog/AdminActionType.java | 42 ++++++++++ .../adminActionLog/AdminTargetType.java | 5 ++ .../controller/AdminGroupLeaveController.java | 4 + .../domain/pod/controller/PodController.java | 3 + .../AdminRequestChangeController.java | 4 + .../controller/AdminRequestController.java | 10 ++- .../users/controller/AdminUserController.java | 8 ++ .../controller/AdminWarningController.java | 5 ++ .../db/migration/V24__admin_action_logs.sql | 16 ++++ .../admin_be/support/WebMvcTestSupport.java | 4 + 20 files changed, 544 insertions(+), 1 deletion(-) create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminAction.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLog.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogBodyAdvice.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogController.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogInterceptor.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQuery.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQueryRepository.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogRepository.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWebConfig.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWriter.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionType.java create mode 100644 src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminTargetType.java create mode 100644 src/main/resources/db/migration/V24__admin_action_logs.sql diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminAction.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminAction.java new file mode 100644 index 00000000..599ebc99 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminAction.java @@ -0,0 +1,18 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** 이 엔드포인트가 성공하든 실패하든 관리자 작업 기록을 하나 남긴다. */ +@Target(ElementType.METHOD) // 메서드에만 붙일 수 있다. 클래스나 필드에 붙이면 컴파일 오류. +@Retention(RetentionPolicy.RUNTIME) // 실행 중에도 남겨 둔다. 빼면 기본값 CLASS가 되어 실행 중에 읽을 수 없고, + // 기록 코드가 항상 null을 받아 아무것도 남지 않는다(오류도 안 난다). +public @interface AdminAction { + /** 무슨 작업인지 */ + AdminActionType value(); + + /** 대상의 식별자를 담은 경로 변수 이름. 예: "requestId" */ + String targetId(); +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLog.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLog.java new file mode 100644 index 00000000..b7612a6f --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLog.java @@ -0,0 +1,56 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Entity +@Table(name = "admin_action_logs") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class AdminActionLog { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "admin_id", nullable = false) + private Long adminId; + + @Column(name = "action_type", nullable = false, length = 50) + private String actionType; + + @Column(name = "target_type", nullable = false, length = 30) + private String targetType; + + @Column(name = "target_id", nullable = false, length = 255) + private String targetId; + + @Column(name = "requested_role", length = 32) + private String requestedRole; + + @Column(name = "http_status", nullable = false) + private int httpStatus; + + @Column(name = "occurred_at", nullable = false) + private LocalDateTime occurredAt; + + public AdminActionLog(Long adminId, AdminActionType actionType, String targetId, + String requestedRole, int httpStatus, LocalDateTime occurredAt) { + this.adminId = adminId; + this.actionType = actionType.name(); + this.targetType = actionType.targetType().name(); + this.targetId = targetId; + this.requestedRole = requestedRole; + this.httpStatus = httpStatus; + this.occurredAt = occurredAt; + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogBodyAdvice.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogBodyAdvice.java new file mode 100644 index 00000000..301cf831 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogBodyAdvice.java @@ -0,0 +1,40 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import DGU_AI_LAB.admin_be.domain.users.dto.request.ChangeRoleRequestDTO; +import org.springframework.core.MethodParameter; +import org.springframework.http.HttpInputMessage; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter; + +import java.lang.reflect.Type; + +@ControllerAdvice +public class AdminActionLogBodyAdvice extends RequestBodyAdviceAdapter { + + static final String REQUESTED_ROLE_ATTRIBUTE = + AdminActionLogBodyAdvice.class.getName() + ".requestedRole"; + + @Override + public boolean supports(MethodParameter parameter, Type targetType, + Class> converterType) { + AdminAction action = parameter.getMethodAnnotation(AdminAction.class); + return action != null + && action.value() == AdminActionType.USER_ROLE_CHANGE + && parameter.getParameterType() == ChangeRoleRequestDTO.class; + } + + @Override + public Object afterBodyRead(Object body, HttpInputMessage inputMessage, + MethodParameter parameter, Type targetType, + Class> converterType) { + RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); + if (attributes != null && body instanceof ChangeRoleRequestDTO dto && dto.role() != null) { + attributes.setAttribute( + REQUESTED_ROLE_ATTRIBUTE, dto.role().name(), RequestAttributes.SCOPE_REQUEST); + } + return body; + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogController.java new file mode 100644 index 00000000..179a8290 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogController.java @@ -0,0 +1,70 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import DGU_AI_LAB.admin_be.global.common.SuccessResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.ZoneOffset; +import java.util.List; + +@RestController +@RequestMapping("/api/admin/action-logs") +@RequiredArgsConstructor +public class AdminActionLogController { + + private final AdminActionLogQueryRepository queryRepository; + + @GetMapping + public ResponseEntity> findLogs( + @Valid @ModelAttribute AdminActionLogQuery query) { + int pageSize = query.pageSize(); + List rows = queryRepository.find(query); + + List items = rows.stream() + .limit(pageSize) + .map(LogItem::from) + .toList(); + + Cursor nextCursor = null; + if (rows.size() > pageSize) { + LogItem lastItem = items.get(items.size() - 1); + nextCursor = new Cursor(lastItem.occurredAt(), lastItem.id()); + } + + return SuccessResponse.ok(new LogPage(items, nextCursor)); + } + + public record LogPage(List items, Cursor nextCursor) { + } + + public record Cursor(String before, Long beforeId) { + } + + public record LogItem( + Long id, + Long adminId, + String actionType, + String targetType, + String targetId, + String requestedRole, + int httpStatus, + String occurredAt + ) { + private static LogItem from(AdminActionLog row) { + return new LogItem( + row.getId(), + row.getAdminId(), + row.getActionType(), + row.getTargetType(), + row.getTargetId(), + row.getRequestedRole(), + row.getHttpStatus(), + row.getOccurredAt().toInstant(ZoneOffset.UTC).toString()); + } + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogInterceptor.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogInterceptor.java new file mode 100644 index 00000000..ed434c43 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogInterceptor.java @@ -0,0 +1,65 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import DGU_AI_LAB.admin_be.global.auth.CustomUserDetails; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.HandlerMapping; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Map; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AdminActionLogInterceptor implements HandlerInterceptor { + + private final AdminActionLogWriter adminActionLogWriter; + + @Override + public void afterCompletion(HttpServletRequest request, + HttpServletResponse response, + Object handler, + Exception ex) { + if (!(handler instanceof HandlerMethod handlerMethod)) { + return; + } + + AdminAction action = handlerMethod.getMethodAnnotation(AdminAction.class); + if (action == null) { + return; + } + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !authentication.isAuthenticated() + || !(authentication.getPrincipal() instanceof CustomUserDetails principal)) { + return; + } + + Long adminId = principal.getUserId(); + + Object variables = request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); + if (!(variables instanceof Map pathVariables) + || !(pathVariables.get(action.targetId()) instanceof String targetId)) { + log.error("Missing admin action target: adminId={} action={} variable={}", + adminId, action.value(), action.targetId()); + return; + } + + Object roleAttribute = request.getAttribute(AdminActionLogBodyAdvice.REQUESTED_ROLE_ATTRIBUTE); + String requestedRole = roleAttribute instanceof String role ? role : null; + + AdminActionLog entry = new AdminActionLog( + adminId, action.value(), targetId, requestedRole, + response.getStatus(), LocalDateTime.now(ZoneOffset.UTC)); + + adminActionLogWriter.submit(entry); + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQuery.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQuery.java new file mode 100644 index 00000000..56fce4f2 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQuery.java @@ -0,0 +1,37 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.Size; + +import java.time.Instant; + +public record AdminActionLogQuery( + @Positive Long adminId, + Instant from, + Instant to, + AdminTargetType targetType, + @Size(min = 1, max = 255) String targetId, + AdminActionType actionType, + @Size(min = 1, max = 32) String requestedRole, + @Min(100) @Max(599) Integer httpStatus, + Instant before, + @Positive Long beforeId, + @Min(1) @Max(100) Integer size +) { + @AssertTrue(message = "from은 to보다 이전이어야 합니다.") + public boolean isPeriodValid() { + return from == null || to == null || from.isBefore(to); + } + + @AssertTrue(message = "before와 beforeId는 함께 지정해야 합니다.") + public boolean isCursorValid() { + return before == null ? beforeId == null : beforeId != null; + } + + public int pageSize() { + return size == null ? 20 : size; + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQueryRepository.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQueryRepository.java new file mode 100644 index 00000000..720a3448 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogQueryRepository.java @@ -0,0 +1,76 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.List; + +@Repository +public class AdminActionLogQueryRepository { + + @PersistenceContext + private EntityManager entityManager; + + @Transactional(readOnly = true) + public List find(AdminActionLogQuery filter) { + CriteriaBuilder builder = entityManager.getCriteriaBuilder(); + CriteriaQuery query = builder.createQuery(AdminActionLog.class); + Root row = query.from(AdminActionLog.class); + Path occurredAt = row.get("occurredAt"); + Path id = row.get("id"); + List conditions = new ArrayList<>(); + + addEquality(builder, row, conditions, "adminId", filter.adminId()); + addEquality(builder, row, conditions, "targetId", filter.targetId()); + addEquality(builder, row, conditions, "requestedRole", filter.requestedRole()); + addEquality(builder, row, conditions, "httpStatus", filter.httpStatus()); + + if (filter.targetType() != null) { + conditions.add(builder.equal(row.get("targetType"), filter.targetType().name())); + } + if (filter.actionType() != null) { + conditions.add(builder.equal(row.get("actionType"), filter.actionType().name())); + } + if (filter.from() != null) { + LocalDateTime from = LocalDateTime.ofInstant(filter.from(), ZoneOffset.UTC); + conditions.add(builder.greaterThanOrEqualTo(occurredAt, from)); + } + if (filter.to() != null) { + LocalDateTime to = LocalDateTime.ofInstant(filter.to(), ZoneOffset.UTC); + conditions.add(builder.lessThan(occurredAt, to)); + } + if (filter.before() != null) { + LocalDateTime before = LocalDateTime.ofInstant(filter.before(), ZoneOffset.UTC); + conditions.add(builder.or( + builder.lessThan(occurredAt, before), + builder.and( + builder.equal(occurredAt, before), + builder.lessThan(id, filter.beforeId())))); + } + + query.select(row) + .where(conditions.toArray(Predicate[]::new)) + .orderBy(builder.desc(occurredAt), builder.desc(id)); + + return entityManager.createQuery(query) + .setMaxResults(filter.pageSize() + 1) + .getResultList(); + } + + private void addEquality(CriteriaBuilder builder, Root row, + List conditions, String field, Object value) { + if (value != null) { + conditions.add(builder.equal(row.get(field), value)); + } + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogRepository.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogRepository.java new file mode 100644 index 00000000..10a7b256 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogRepository.java @@ -0,0 +1,6 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface AdminActionLogRepository extends JpaRepository { +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWebConfig.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWebConfig.java new file mode 100644 index 00000000..03a270f6 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWebConfig.java @@ -0,0 +1,19 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@RequiredArgsConstructor +public class AdminActionLogWebConfig implements WebMvcConfigurer { + + private final AdminActionLogInterceptor adminActionLogInterceptor; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(adminActionLogInterceptor) + .addPathPatterns("/api/admin/**"); + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWriter.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWriter.java new file mode 100644 index 00000000..6c5033ae --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionLogWriter.java @@ -0,0 +1,57 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +import jakarta.annotation.PreDestroy; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.task.TaskRejectedException; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.stereotype.Component; + +import java.util.concurrent.ThreadPoolExecutor; + +@Slf4j +@Component +public class AdminActionLogWriter { + + private final AdminActionLogRepository repository; + private final ThreadPoolTaskExecutor executor; + + public AdminActionLogWriter(AdminActionLogRepository repository) { + this.repository = repository; + this.executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(1); + executor.setMaxPoolSize(1); + executor.setQueueCapacity(100); + executor.setThreadNamePrefix("admin-action-log-"); + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy()); + executor.setWaitForTasksToCompleteOnShutdown(true); + executor.setAwaitTerminationSeconds(5); + executor.initialize(); + } + + public void submit(AdminActionLog entry) { + try { + executor.execute(() -> save(entry)); + } catch (TaskRejectedException e) { + logFailure("queue rejected", entry, e); + } + } + + private void save(AdminActionLog entry) { + try { + repository.save(entry); + } catch (RuntimeException e) { + logFailure("database write failed", entry, e); + } + } + + private void logFailure(String reason, AdminActionLog entry, RuntimeException e) { + log.error("Admin action log {}: adminId={} action={} targetId={} status={} occurredAt={}", + reason, entry.getAdminId(), entry.getActionType(), + entry.getTargetId(), entry.getHttpStatus(), entry.getOccurredAt(), e); + } + + @PreDestroy + void shutdown() { + executor.shutdown(); + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionType.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionType.java new file mode 100644 index 00000000..28986a19 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminActionType.java @@ -0,0 +1,42 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +public enum AdminActionType { + // 신청 — /api/admin/requests/{requestId}/... + REQUEST_APPROVE(AdminTargetType.REQUEST), + REQUEST_REJECT(AdminTargetType.REQUEST), + REQUEST_MIGRATE(AdminTargetType.REQUEST), + REQUEST_RESTART(AdminTargetType.REQUEST), + CONTAINER_DELETE(AdminTargetType.REQUEST), + CONTAINER_FORCE_COMPLETE(AdminTargetType.REQUEST), + + // 사용자 — /api/admin/users/{id}/... , /api/admin/users/{userId}/warnings... + USER_ACTIVATION_CHANGE(AdminTargetType.USER), + USER_ROLE_CHANGE(AdminTargetType.USER), + USER_PASSWORD_RESET(AdminTargetType.USER), + USER_GROUP_REMOVE(AdminTargetType.USER), + UBUNTU_ACCOUNT_DELETE(AdminTargetType.USER), + WARNING_GRANT(AdminTargetType.USER), + WARNING_DEDUCT(AdminTargetType.USER), + WARNING_CANCEL(AdminTargetType.USER), + + // 변경 신청 — /api/admin/change-requests/{changeRequestId}/... + CHANGE_REQUEST_APPROVE(AdminTargetType.CHANGE_REQUEST), + CHANGE_REQUEST_REJECT(AdminTargetType.CHANGE_REQUEST), + + // Pod — /api/admin/pods/{podName} + ORPHAN_POD_DELETE(AdminTargetType.POD), + + // 그룹 탈퇴 신청 — /api/admin/group-leave-requests/{leaveRequestId}/... + GROUP_LEAVE_APPROVE(AdminTargetType.GROUP_LEAVE_REQUEST), + GROUP_LEAVE_REJECT(AdminTargetType.GROUP_LEAVE_REQUEST); + + private final AdminTargetType targetType; + + AdminActionType(AdminTargetType targetType) { + this.targetType = targetType; + } + + public AdminTargetType targetType() { + return targetType; + } +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminTargetType.java b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminTargetType.java new file mode 100644 index 00000000..102e6d10 --- /dev/null +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/adminActionLog/AdminTargetType.java @@ -0,0 +1,5 @@ +package DGU_AI_LAB.admin_be.domain.adminActionLog; + +public enum AdminTargetType { + REQUEST, USER, CHANGE_REQUEST, POD, GROUP_LEAVE_REQUEST +} \ No newline at end of file diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/groups/controller/AdminGroupLeaveController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/groups/controller/AdminGroupLeaveController.java index 32dfe19c..b5157115 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/groups/controller/AdminGroupLeaveController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/groups/controller/AdminGroupLeaveController.java @@ -1,5 +1,7 @@ package DGU_AI_LAB.admin_be.domain.groups.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; import DGU_AI_LAB.admin_be.domain.groups.dto.response.GroupLeaveResponseDTO; import DGU_AI_LAB.admin_be.domain.groups.service.GroupLeaveService; import DGU_AI_LAB.admin_be.global.auth.CustomUserDetails; @@ -23,6 +25,7 @@ public ResponseEntity> pending() { return SuccessResponse.ok(groupLeaveService.pending().stream().map(GroupLeaveResponseDTO::fromEntity).toList()); } + @AdminAction(value = AdminActionType.GROUP_LEAVE_APPROVE, targetId = "leaveRequestId") @PostMapping("/{leaveRequestId}/approval") public ResponseEntity> approve(@PathVariable Long leaveRequestId, @AuthenticationPrincipal CustomUserDetails principal) { @@ -30,6 +33,7 @@ public ResponseEntity> approve(@PathVariable Long leaveReques groupLeaveService.approve(leaveRequestId, principal.getUserId()))); } + @AdminAction(value = AdminActionType.GROUP_LEAVE_REJECT, targetId = "leaveRequestId") @PostMapping("/{leaveRequestId}/rejection") public ResponseEntity> reject(@PathVariable Long leaveRequestId, @AuthenticationPrincipal CustomUserDetails principal) { diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/pod/controller/PodController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/pod/controller/PodController.java index 9d583f5c..4339ec12 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/pod/controller/PodController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/pod/controller/PodController.java @@ -1,5 +1,7 @@ package DGU_AI_LAB.admin_be.domain.pod.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; import DGU_AI_LAB.admin_be.domain.pod.controller.docs.PodApi; import DGU_AI_LAB.admin_be.domain.pod.dto.response.PodEventDTO; import DGU_AI_LAB.admin_be.domain.pod.dto.response.PodResponseDTO; @@ -63,6 +65,7 @@ public List getPodEvents(@PathVariable String podName) { } // DB에 대응하는 신청이 없는 고아 Pod 직접 삭제 (신청 이력이 있으면 409로 거부) + @AdminAction(value = AdminActionType.ORPHAN_POD_DELETE, targetId = "podName") @DeleteMapping("/{podName}") public ResponseEntity> deleteOrphanPod(@PathVariable String podName) { podService.deleteOrphanPod(podName); diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestChangeController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestChangeController.java index 34c40b80..c6ca1d1c 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestChangeController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestChangeController.java @@ -1,5 +1,7 @@ package DGU_AI_LAB.admin_be.domain.requests.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; import DGU_AI_LAB.admin_be.domain.requests.controller.docs.AdminRequestChangeApi; import DGU_AI_LAB.admin_be.domain.requests.dto.request.ChangeDecisionRequestDTO; import DGU_AI_LAB.admin_be.domain.requests.dto.response.ChangeRequestResponseDTO; @@ -33,6 +35,7 @@ public ResponseEntity> getAllChangeRequests() { return SuccessResponse.ok(changeRequests); } + @AdminAction(value = AdminActionType.CHANGE_REQUEST_APPROVE, targetId = "changeRequestId") @PostMapping("/{changeRequestId}/approval") public ResponseEntity> approveModification( @AuthenticationPrincipal(expression = "userId") Long adminId, @@ -44,6 +47,7 @@ public ResponseEntity> approveModification( return status == Status.PROCESSING ? SuccessResponse.accepted(null) : SuccessResponse.ok(null); } + @AdminAction(value = AdminActionType.CHANGE_REQUEST_REJECT, targetId = "changeRequestId") @PostMapping("/{changeRequestId}/rejection") public ResponseEntity> rejectModification( @AuthenticationPrincipal(expression = "userId") Long adminId, diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestController.java index bcf94fe3..668a8b56 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/controller/AdminRequestController.java @@ -1,5 +1,8 @@ package DGU_AI_LAB.admin_be.domain.requests.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; + import DGU_AI_LAB.admin_be.domain.requests.job.JobHistoryService; import DGU_AI_LAB.admin_be.domain.requests.dto.request.ApprovalRequestDTO; import DGU_AI_LAB.admin_be.domain.requests.dto.request.RejectionRequestDTO; @@ -82,7 +85,7 @@ public ResponseEntity> getAllActiveContainers( return SuccessResponse.ok(containers); } - + @AdminAction(value = AdminActionType.REQUEST_APPROVE, targetId = "requestId") @PostMapping("/{requestId}/approval") public ResponseEntity> approveRequest(@PathVariable Long requestId, @AuthenticationPrincipal(expression = "userId") Long adminUserId, @@ -95,6 +98,7 @@ public ResponseEntity> approveRequest(@PathVariable Long requ return SuccessResponse.accepted(responseDto); } + @AdminAction(value = AdminActionType.REQUEST_REJECT, targetId = "requestId") @PostMapping("/{requestId}/rejection") public ResponseEntity> rejectRequest(@PathVariable Long requestId, @RequestBody @Valid RejectionRequestDTO dto) { @@ -115,6 +119,7 @@ public ResponseEntity> getProvisioningStatus(@PathVariable Lo return SuccessResponse.ok(jobHistoryService.getProvisioningStatus(requestId)); } + @AdminAction(value = AdminActionType.REQUEST_MIGRATE, targetId = "requestId") @PostMapping("/{requestId}/migrations") public ResponseEntity> startMigration(@PathVariable Long requestId, @RequestBody @Valid MigratePodRequestDTO dto) { @@ -123,6 +128,7 @@ public ResponseEntity> startMigration(@PathVariable Long requ } /** 현재 노드에서 컨테이너를 다시 만든다. 결과는 마지막 마이그레이션 결과로 확인한다. */ + @AdminAction(value = AdminActionType.REQUEST_RESTART, targetId = "requestId") @PostMapping("/{requestId}/restarts") public ResponseEntity> startRestart(@PathVariable Long requestId, @RequestBody(required = false) RestartPodRequestDTO dto) { @@ -140,6 +146,7 @@ public ResponseEntity> getLatestMigration(@PathVariable Long * 건드리지 않는다. 계정까지 회수하려면 사용자 관리의 계정 회수(DELETE /api/admin/users/{id}/ubuntu-account)를 * 쓴다 — 그쪽은 그 사용자의 컨테이너를 전부 정리한다. */ + @AdminAction(value = AdminActionType.CONTAINER_DELETE, targetId = "requestId") @DeleteMapping("/{requestId}/container") public ResponseEntity> deleteContainer(@PathVariable Long requestId) { requestExpiryService.deleteContainerByAdmin(requestId); @@ -150,6 +157,7 @@ public ResponseEntity> deleteContainer(@PathVariable Long req * 컨테이너 회수가 DEGRADED·UNKNOWN으로 끝나 EXPIRING에 멈춘 신청을, 관리자가 클러스터를 직접 확인한 * 뒤 강제로 완료 처리한다. API 자체는 자원 존재를 재확인하지 않는다. */ + @AdminAction(value = AdminActionType.CONTAINER_FORCE_COMPLETE, targetId = "requestId") @PostMapping("/{requestId}/container/force-complete") public ResponseEntity> forceCompleteRevoke(@PathVariable Long requestId) { requestExpiryService.forceCompleteRevoke(requestId); diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/users/controller/AdminUserController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/users/controller/AdminUserController.java index 19aee6ed..7c9ead07 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/users/controller/AdminUserController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/users/controller/AdminUserController.java @@ -1,5 +1,8 @@ package DGU_AI_LAB.admin_be.domain.users.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; + import DGU_AI_LAB.admin_be.domain.users.dto.request.UserActivationRequestDTO; import DGU_AI_LAB.admin_be.domain.users.controller.docs.AdminUserApi; @@ -42,6 +45,7 @@ public ResponseEntity> deleteUser(@PathVariable Long id) { return SuccessResponse.accepted(null); } + @AdminAction(value = AdminActionType.UBUNTU_ACCOUNT_DELETE, targetId = "id") @DeleteMapping("/{id}/ubuntu-account") public ResponseEntity> deleteUbuntuAccount(@PathVariable Long id) { adminUserService.deleteUbuntuAccountOfUser(id); @@ -49,6 +53,7 @@ public ResponseEntity> deleteUbuntuAccount(@PathVariable Long } /** 활성 상태 변경. {"active": false}면 비활성화(컨테이너·계정 정리), true면 재활성화. */ + @AdminAction(value = AdminActionType.USER_ACTIVATION_CHANGE, targetId = "id") @PatchMapping("/{id}") public ResponseEntity> updateUserActivation(@PathVariable Long id, @RequestBody @Valid UserActivationRequestDTO dto) { @@ -62,17 +67,20 @@ public ResponseEntity> getUserGroups(@PathVariable Long id) { return SuccessResponse.ok(userGroupService.getGroupsOfUser(id)); } + @AdminAction(value = AdminActionType.USER_GROUP_REMOVE, targetId = "id") @DeleteMapping("/{id}/groups/{groupId}") public ResponseEntity> removeUserFromGroup(@PathVariable Long id, @PathVariable Long groupId, @AuthenticationPrincipal(expression = "userId") Long adminId) { return SuccessResponse.accepted(userGroupService.removeUserFromGroup(id, groupId, adminId)); } + @AdminAction(value = AdminActionType.USER_ROLE_CHANGE, targetId = "id") @PatchMapping("/{id}/role") public ResponseEntity> changeUserRole(@PathVariable Long id, @RequestBody @Valid ChangeRoleRequestDTO dto) { return SuccessResponse.ok(adminUserService.changeUserRole(id, dto.role())); } + @AdminAction(value = AdminActionType.USER_PASSWORD_RESET, targetId = "id") @PutMapping("/{id}/password") public ResponseEntity> resetPassword(@AuthenticationPrincipal(expression = "userId") Long adminId, @PathVariable Long id, diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/warnings/controller/AdminWarningController.java b/src/main/java/DGU_AI_LAB/admin_be/domain/warnings/controller/AdminWarningController.java index 1cae41e4..a258ae25 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/warnings/controller/AdminWarningController.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/warnings/controller/AdminWarningController.java @@ -1,5 +1,7 @@ package DGU_AI_LAB.admin_be.domain.warnings.controller; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminAction; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionType; import DGU_AI_LAB.admin_be.domain.warnings.controller.docs.AdminWarningApi; import DGU_AI_LAB.admin_be.domain.warnings.dto.WarningReasonRequestDTO; import DGU_AI_LAB.admin_be.domain.warnings.service.WarningService; @@ -29,6 +31,7 @@ public ResponseEntity> getWarnings(@PathVariable Long userId) return SuccessResponse.ok(warningService.getStatus(userId)); } + @AdminAction(value = AdminActionType.WARNING_GRANT, targetId = "userId") @PostMapping("/warnings") public ResponseEntity> grantWarning(@PathVariable Long userId, @AuthenticationPrincipal(expression = "userId") Long adminId, @@ -36,6 +39,7 @@ public ResponseEntity> grantWarning(@PathVariable Long userId return SuccessResponse.created(warningService.grant(adminId, userId, dto.reason())); } + @AdminAction(value = AdminActionType.WARNING_DEDUCT, targetId = "userId") @PostMapping("/warning-deductions") public ResponseEntity> deductWarning(@PathVariable Long userId, @AuthenticationPrincipal(expression = "userId") Long adminId, @@ -44,6 +48,7 @@ public ResponseEntity> deductWarning(@PathVariable Long userI } /** 사유는 본문이 아니라 쿼리(reason)로 받는다 — DELETE 본문은 중간 프록시가 버릴 수 있다. */ + @AdminAction(value = AdminActionType.WARNING_CANCEL, targetId = "userId") @DeleteMapping("/warnings/{warningId}") public ResponseEntity> cancelWarning(@PathVariable Long userId, @PathVariable Long warningId, @AuthenticationPrincipal(expression = "userId") Long adminId, diff --git a/src/main/resources/db/migration/V24__admin_action_logs.sql b/src/main/resources/db/migration/V24__admin_action_logs.sql new file mode 100644 index 00000000..3a7bf6ac --- /dev/null +++ b/src/main/resources/db/migration/V24__admin_action_logs.sql @@ -0,0 +1,16 @@ +CREATE TABLE admin_action_logs ( + id BIGINT NOT NULL AUTO_INCREMENT, + admin_id BIGINT NOT NULL, + action_type VARCHAR(50) NOT NULL, + target_type VARCHAR(30) NOT NULL, + target_id VARCHAR(255) NOT NULL, + requested_role VARCHAR(32) NULL, + http_status INT NOT NULL, + occurred_at DATETIME(6) NOT NULL, + + PRIMARY KEY (id), + INDEX idx_admin_action_logs_admin_time (admin_id, occurred_at, id), + INDEX idx_admin_action_logs_target_action_time + (target_type, target_id, action_type, occurred_at, id), + INDEX idx_admin_action_logs_time (occurred_at, id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/src/test/java/DGU_AI_LAB/admin_be/support/WebMvcTestSupport.java b/src/test/java/DGU_AI_LAB/admin_be/support/WebMvcTestSupport.java index f29b386c..6a9bd81b 100644 --- a/src/test/java/DGU_AI_LAB/admin_be/support/WebMvcTestSupport.java +++ b/src/test/java/DGU_AI_LAB/admin_be/support/WebMvcTestSupport.java @@ -5,6 +5,7 @@ import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.test.context.bean.override.mockito.MockitoBean; +import DGU_AI_LAB.admin_be.domain.adminActionLog.AdminActionLogWriter; /** * @WebMvcTest에서 Spring Security 및 JPA 관련 빈 충돌 방지를 위한 공통 Mock 설정. @@ -13,6 +14,9 @@ */ public abstract class WebMvcTestSupport { + @MockitoBean + protected AdminActionLogWriter adminActionLogWriter; + @MockitoBean protected JpaMetamodelMappingContext jpaMetamodelMappingContext;