From e0e749a8297c0a36fd0dc27f77ebbe412ac4aed6 Mon Sep 17 00:00:00 2001 From: dongmin0204 Date: Tue, 2 Jun 2026 20:06:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=84=A4=EA=B3=84=EB=A5=BC=20ubuntu?= =?UTF-8?q?PasswordBase64=20=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=AA=85=ED=99=95=ED=9E=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin_be/domain/users/service/UserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/users/service/UserService.java b/src/main/java/DGU_AI_LAB/admin_be/domain/users/service/UserService.java index f0576f4..8e34d5c 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/users/service/UserService.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/users/service/UserService.java @@ -61,11 +61,11 @@ public UserAuthResponseDTO userAuth(UserAuthRequestDTO dto) { log.info("사용자 인증을 시작합니다. username: {}", dto.username()); // 2. 비밀번호 확인 - String encodedPassword = dto.passwordBase64(); + String passwordBase64 = dto.passwordBase64(); log.debug("비밀번호를 확인합니다. username: {}", dto.username()); // 3. 사용자 및 비밀번호 일치 여부 확인 - Request request = requestRepository.findByUbuntuUsernameAndUbuntuPassword(dto.username(), encodedPassword) + Request request = requestRepository.findByUbuntuUsernameAndUbuntuPasswordBase64(dto.username(), passwordBase64) .orElseThrow(() -> { // 3-1. 사용자 정보를 찾을 수 없을 때의 로그 log.warn("사용자 '{}'를 찾을 수 없거나 비밀번호가 일치하지 않습니다.", dto.username()); @@ -73,7 +73,7 @@ public UserAuthResponseDTO userAuth(UserAuthRequestDTO dto) { }); // 4. 추가 비밀번호 일치 확인 (Optional: Optional로 처리되었기 때문에 이중 확인) - if (!encodedPassword.equals(request.getUbuntuPassword())) { + if (!passwordBase64.equals(request.getUbuntuPasswordBase64())) { // 4-1. 비밀번호 불일치 로그 log.error("사용자 '{}'에 대해 데이터베이스 비밀번호와 암호화된 비밀번호가 일치하지 않습니다. (내부 로직 오류 가능성)", dto.username()); throw new UnauthorizedException(ErrorCode.INVALID_LOGIN_INFO); From 593be8edb174735fb48275fe212e558c8f7a93a2 Mon Sep 17 00:00:00 2001 From: dongmin0204 Date: Tue, 2 Jun 2026 20:06:19 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=EC=9D=B8=EC=A6=9D=EB=8F=84=20ubu?= =?UTF-8?q?ntu=5Fpassword=5Fbase64=20=EC=BB=AC=EB=9F=BC=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin_be/domain/requests/repository/RequestRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/repository/RequestRepository.java b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/repository/RequestRepository.java index d5a8961..f121937 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/repository/RequestRepository.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/repository/RequestRepository.java @@ -19,7 +19,7 @@ public interface RequestRepository extends JpaRepository { Optional findByUbuntuUsername(String username); List findAllByUser_UserId(Long userId); List findAllByStatus(Status status); - Optional findByUbuntuUsernameAndUbuntuPassword(String username, String passwordBase64); + Optional findByUbuntuUsernameAndUbuntuPasswordBase64(String username, String passwordBase64); List findByUserUserIdAndStatus(Long userId, Status status); boolean existsByUbuntuUsername(String ubuntuUsername); List findAllByUser_UserIdAndStatus(Long userId, Status status); From df1fb8a26c6c45be62e1b8e9dbb76096cb99cef5 Mon Sep 17 00:00:00 2001 From: dongmin0204 Date: Tue, 2 Jun 2026 20:06:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20UserService=EC=99=80=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=8A=B9=EC=9D=B8/=EC=83=9D=EC=84=B1=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/requests/dto/request/SaveRequestRequestDTO.java | 2 +- .../admin_be/domain/users/service/UserServiceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/dto/request/SaveRequestRequestDTO.java b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/dto/request/SaveRequestRequestDTO.java index 22e918c..02b884c 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/dto/request/SaveRequestRequestDTO.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/dto/request/SaveRequestRequestDTO.java @@ -77,7 +77,7 @@ public Request toEntity( .containerImage(image) .ubuntuUsername(ubuntuUsername) .ubuntuPassword(ubuntuPasswordBase64) - .ubuntuPasswordBase64(ubuntuPassword) + .ubuntuPasswordBase64(ubuntuPasswordBase64) .volumeSizeGiB(volumeSizeGiB) .usagePurpose(usagePurpose) .formAnswers(formAnswersJson) diff --git a/src/test/java/DGU_AI_LAB/admin_be/domain/users/service/UserServiceTest.java b/src/test/java/DGU_AI_LAB/admin_be/domain/users/service/UserServiceTest.java index e55a44f..2e578c8 100644 --- a/src/test/java/DGU_AI_LAB/admin_be/domain/users/service/UserServiceTest.java +++ b/src/test/java/DGU_AI_LAB/admin_be/domain/users/service/UserServiceTest.java @@ -196,8 +196,8 @@ void userAuth_success() { Request request = mock(Request.class); when(request.getUbuntuUsername()).thenReturn("testuser"); - when(request.getUbuntuPassword()).thenReturn(passwordBase64); - when(requestRepository.findByUbuntuUsernameAndUbuntuPassword("testuser", passwordBase64)) + when(request.getUbuntuPasswordBase64()).thenReturn(passwordBase64); + when(requestRepository.findByUbuntuUsernameAndUbuntuPasswordBase64("testuser", passwordBase64)) .thenReturn(Optional.of(request)); UserAuthRequestDTO dto = new UserAuthRequestDTO("testuser", passwordBase64); @@ -210,7 +210,7 @@ void userAuth_success() { @Test @DisplayName("존재하지 않는 username으로 인증하면 UnauthorizedException을 던진다") void userAuth_throwsException_whenUsernameNotFound() { - when(requestRepository.findByUbuntuUsernameAndUbuntuPassword(anyString(), anyString())) + when(requestRepository.findByUbuntuUsernameAndUbuntuPasswordBase64(anyString(), anyString())) .thenReturn(Optional.empty()); UserAuthRequestDTO dto = new UserAuthRequestDTO("unknownuser", "dGVzdA==");