diff --git a/.github/workflows/deploy-to-dev-ec2.yml b/.github/workflows/deploy-to-dev-ec2.yml index c91c571..690bd76 100644 --- a/.github/workflows/deploy-to-dev-ec2.yml +++ b/.github/workflows/deploy-to-dev-ec2.yml @@ -147,7 +147,7 @@ jobs: ANTHROPIC_API_KEY="${{ secrets.ANTHROPIC_API_KEY }}" \ GOOGLE_GENAI_API_KEY="${{ secrets.GOOGLE_GENAI_API_KEY }}" \ FIREBASE_ADMIN_KEY="${{ secrets.FIREBASE_ADMIN_KEY }}" \ - ADMIN_PAGE_PASSWORD="${{ secrets.ADMIN_PAGE_PASSWORD }}" \ + ADMIN_PAGE_PASSWORD='${{ secrets.ADMIN_PAGE_PASSWORD }}' \ DEV_TEST_ACCOUNT_PASSWORD="${{ secrets.DEV_TEST_ACCOUNT_PASSWORD }}" \ nohup java -jar "$JAR_PATH" \ --spring.profiles.active=dev > app.log 2>&1 & diff --git a/.github/workflows/deploy-to-prod-ec2.yml b/.github/workflows/deploy-to-prod-ec2.yml index bf2f312..9dd4ea0 100644 --- a/.github/workflows/deploy-to-prod-ec2.yml +++ b/.github/workflows/deploy-to-prod-ec2.yml @@ -144,7 +144,7 @@ jobs: ANTHROPIC_API_KEY="${{ secrets.ANTHROPIC_API_KEY }}" \ GOOGLE_GENAI_API_KEY="${{ secrets.GOOGLE_GENAI_API_KEY }}" \ FIREBASE_ADMIN_KEY="${{ secrets.FIREBASE_ADMIN_KEY }}" \ - ADMIN_PAGE_PASSWORD="${{ secrets.ADMIN_PAGE_PASSWORD }}" \ + ADMIN_PAGE_PASSWORD='${{ secrets.ADMIN_PAGE_PASSWORD }}' \ nohup java -jar "$JAR_PATH" \ --spring.profiles.active=prod > app-prod.log 2>&1 & diff --git a/src/main/java/com/devkor/ifive/nadab/domain/admin/application/AdminPageAuthCommandService.java b/src/main/java/com/devkor/ifive/nadab/domain/admin/application/AdminPageAuthCommandService.java index 4e236b3..0183c08 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/admin/application/AdminPageAuthCommandService.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/admin/application/AdminPageAuthCommandService.java @@ -16,8 +16,8 @@ public class AdminPageAuthCommandService { private final AdminPageProperties adminPageProperties; public void validatePassword(String rawPassword) { - byte[] input = rawPassword.getBytes(StandardCharsets.UTF_8); - byte[] expected = adminPageProperties.getPassword().getBytes(StandardCharsets.UTF_8); + byte[] input = rawPassword.strip().getBytes(StandardCharsets.UTF_8); + byte[] expected = adminPageProperties.getPassword().strip().getBytes(StandardCharsets.UTF_8); if (!MessageDigest.isEqual(input, expected)) { throw new UnauthorizedException(ErrorCode.ADMIN_PAGE_INVALID_PASSWORD); diff --git a/src/main/resources/templates/admin/login.html b/src/main/resources/templates/admin/login.html index 0858d5c..b2051df 100644 --- a/src/main/resources/templates/admin/login.html +++ b/src/main/resources/templates/admin/login.html @@ -133,7 +133,7 @@