Merge pull request #107 from prgrms-aibe-devcourse/main: main to publish

main to publish

Author: Paley-Z

src/main/java/com/bootsignal/domain/auth/service/MailPasswordResetTokenNotifier.java

@@ -1,13 +1,17 @@
 package com.bootsignal.domain.auth.service;
 
 import com.bootsignal.domain.user.entity.User;
+import com.bootsignal.global.config.Utf8DotenvLoader;
 import com.bootsignal.global.config.properties.PasswordResetProperties;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
 /**
@@ -19,25 +23,39 @@
 @ConditionalOnProperty(prefix = "app.auth.password-reset.mail", name = "enabled", havingValue = "true")
 public class MailPasswordResetTokenNotifier implements PasswordResetTokenNotifier {
 
+	private static final String MAIL_SUBJECT_ENV = "PASSWORD_RESET_MAIL_SUBJECT";
+
 	private final JavaMailSender javaMailSender;
 	private final PasswordResetProperties passwordResetProperties;
 
 	@Override
 	public void send(User user, String rawToken, String resetUrl, Instant expiresAt) {
-		SimpleMailMessage message = new SimpleMailMessage();
-		message.setFrom(passwordResetProperties.mail().from());
-		message.setTo(user.getEmail());
-		message.setSubject(passwordResetProperties.mail().subject());
-		message.setText("""
-			BootSignal 비밀번호 재설정을 요청하셨습니다.
+		try {
+			MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+			MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, false, StandardCharsets.UTF_8.name());
+			helper.setFrom(passwordResetProperties.mail().from());
+			helper.setTo(user.getEmail());
+			helper.setSubject(resolveSubject());
+			helper.setText("""
+				BootSignal 비밀번호 재설정을 요청하셨습니다.
 
-			아래 링크에서 새 비밀번호를 설정해 주세요.
-			%s
+				아래 링크에서 새 비밀번호를 설정해 주세요.
+				%s
 
-			이 링크는 %s까지 사용할 수 있습니다.
-			본인이 요청하지 않았다면 이 메일을 무시해 주세요.
-			""".formatted(resetUrl, expiresAt));
+				이 링크는 %s까지 사용할 수 있습니다.
+				본인이 요청하지 않았다면 이 메일을 무시해 주세요.
+				""".formatted(resetUrl, expiresAt));
+			javaMailSender.send(mimeMessage);
+		} catch (MessagingException exception) {
+			throw new IllegalStateException("비밀번호 재설정 메일 발송에 실패했습니다.", exception);
+		}
+	}
 
-		javaMailSender.send(message);
+	private String resolveSubject() {
+		String fromDotenv = Utf8DotenvLoader.get(MAIL_SUBJECT_ENV);
+		if (fromDotenv != null && !fromDotenv.isBlank()) {
+			return fromDotenv;
+		}
+		return Utf8DotenvLoader.fixUtf8MisreadAsIso8859(passwordResetProperties.mail().subject());
 	}
 }

src/main/java/com/bootsignal/global/config/Utf8DotenvLoader.java

@@ -0,0 +1,84 @@
+package com.bootsignal.global.config;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * .env 파일을 UTF-8로 직접 파싱합니다. Spring config import의 ISO-8859-1 한계를 우회합니다.
+ */
+public final class Utf8DotenvLoader {
+
+	private static final List<Path> DOTENV_CANDIDATES = List.of(
+		Path.of(".env"),
+		Path.of(System.getProperty("user.dir", "."), ".env")
+	);
+
+	private Utf8DotenvLoader() {
+	}
+
+	public static Map<String, String> load() {
+		for (Path candidate : DOTENV_CANDIDATES) {
+			Path normalized = candidate.toAbsolutePath().normalize();
+			if (!Files.isRegularFile(normalized)) {
+				continue;
+			}
+			try {
+				return parse(normalized);
+			} catch (IOException ignored) {
+				// try next candidate
+			}
+		}
+		return Map.of();
+	}
+
+	public static String get(String key) {
+		return load().get(key);
+	}
+
+	static Map<String, String> parse(Path path) throws IOException {
+		Map<String, String> values = new HashMap<>();
+		for (String line : Files.readAllLines(path, StandardCharsets.UTF_8)) {
+			String trimmed = stripBom(line.strip());
+			if (trimmed.isEmpty() || trimmed.startsWith("#")) {
+				continue;
+			}
+			int separator = trimmed.indexOf('=');
+			if (separator <= 0) {
+				continue;
+			}
+			String key = trimmed.substring(0, separator).strip();
+			String value = trimmed.substring(separator + 1).strip();
+			if (!key.isEmpty()) {
+				values.put(key, value);
+			}
+		}
+		return values;
+	}
+
+	public static String fixUtf8MisreadAsIso8859(String value) {
+		if (value == null || value.isBlank() || containsHangul(value)) {
+			return value;
+		}
+		if (value.chars().noneMatch(ch -> ch > 127)) {
+			return value;
+		}
+		String fixed = new String(value.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+		return containsHangul(fixed) ? fixed : value;
+	}
+
+	private static boolean containsHangul(String value) {
+		return value.chars().anyMatch(ch -> Character.UnicodeScript.of(ch) == Character.UnicodeScript.HANGUL);
+	}
+
+	private static String stripBom(String line) {
+		if (!line.isEmpty() && line.charAt(0) == '\uFEFF') {
+			return line.substring(1);
+		}
+		return line;
+	}
+}

src/main/resources/application.yml

@@ -22,6 +22,7 @@ spring:
       max-file-size: ${MULTIPART_MAX_FILE_SIZE:100MB}
       max-request-size: ${MULTIPART_MAX_REQUEST_SIZE:120MB}
   mail:
+    default-encoding: UTF-8
     host: ${SMTP_HOST:}
     port: ${SMTP_PORT:587}
     username: ${SMTP_USERNAME:}

src/test/java/com/bootsignal/domain/auth/service/MailPasswordResetTokenNotifierTest.java

@@ -2,13 +2,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.bootsignal.domain.user.entity.User;
+import com.bootsignal.global.config.Utf8DotenvLoader;
 import com.bootsignal.global.config.properties.PasswordResetProperties;
+import jakarta.mail.internet.MimeMessage;
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -18,13 +20,22 @@
 class MailPasswordResetTokenNotifierTest {
 
 	@Test
-	void sendBuildsPasswordResetMailWithResetUrl() {
+	void sendBuildsPasswordResetMailWithResetUrl() throws Exception {
 		JavaMailSender javaMailSender = org.mockito.Mockito.mock(JavaMailSender.class);
+		MimeMessage mimeMessage = new org.springframework.mail.javamail.JavaMailSenderImpl().createMimeMessage();
+		when(javaMailSender.createMimeMessage()).thenReturn(mimeMessage);
+
+		String fallbackSubject = "비밀번호 재설정";
+		String expectedSubject = Utf8DotenvLoader.get("PASSWORD_RESET_MAIL_SUBJECT");
+		if (expectedSubject == null || expectedSubject.isBlank()) {
+			expectedSubject = fallbackSubject;
+		}
+
 		PasswordResetProperties properties = new PasswordResetProperties(
 			1800L,
 			false,
 			"http://localhost:5173/reset-password?token={token}",
-			new PasswordResetProperties.Mail(true, "support@bootsignal.com", "비밀번호 재설정")
+			new PasswordResetProperties.Mail(true, "support@bootsignal.com", fallbackSubject)
 		);
 		MailPasswordResetTokenNotifier notifier = new MailPasswordResetTokenNotifier(javaMailSender, properties);
 		User user = User.signupLocal("user@example.com", "encoded-password", "홍길동", "tester");
@@ -37,13 +48,13 @@ void sendBuildsPasswordResetMailWithResetUrl() {
 			Instant.parse("2026-06-16T05:00:00Z")
 		);
 
-		ArgumentCaptor<SimpleMailMessage> captor = ArgumentCaptor.forClass(SimpleMailMessage.class);
+		ArgumentCaptor<MimeMessage> captor = ArgumentCaptor.forClass(MimeMessage.class);
 		verify(javaMailSender).send(captor.capture());
-		SimpleMailMessage message = captor.getValue();
-		assertThat(message.getFrom()).isEqualTo("support@bootsignal.com");
-		assertThat(message.getTo()).containsExactly("user@example.com");
-		assertThat(message.getSubject()).isEqualTo("비밀번호 재설정");
-		assertThat(message.getText())
+		MimeMessage message = captor.getValue();
+		assertThat(message.getFrom()[0].toString()).isEqualTo("support@bootsignal.com");
+		assertThat(message.getAllRecipients()[0].toString()).isEqualTo("user@example.com");
+		assertThat(message.getSubject()).isEqualTo(expectedSubject);
+		assertThat(message.getContent().toString())
 			.contains("http://localhost:5173/reset-password?token=raw-reset-token")
 			.contains("2026-06-16T05:00:00Z");
 	}

src/test/java/com/bootsignal/global/config/Utf8DotenvLoaderTest.java

@@ -0,0 +1,36 @@
+package com.bootsignal.global.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.junit.jupiter.api.Test;
+
+class Utf8DotenvLoaderTest {
+
+	@Test
+	void loadsPasswordResetMailSubjectWithHangulFromProjectEnv() {
+		Path envPath = Path.of(".env");
+		if (!Files.isRegularFile(envPath)) {
+			return;
+		}
+
+		String subject = Utf8DotenvLoader.get("PASSWORD_RESET_MAIL_SUBJECT");
+		assertThat(subject).isNotNull();
+		assertThat(subject).contains("BootSignal");
+		assertThat(subject.chars().anyMatch(c -> Character.UnicodeScript.of(c) == Character.UnicodeScript.HANGUL))
+			.as("subject should contain Hangul when .env is UTF-8: %s", subject)
+			.isTrue();
+	}
+
+	@Test
+	void simulatesIso8859MisreadAndFixesMojibake() {
+		String original = "[BootSignal] 비밀번호 재설정 안내";
+		String corrupted = new String(original.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
+
+		String fixed = Utf8DotenvLoader.fixUtf8MisreadAsIso8859(corrupted);
+
+		assertThat(fixed).isEqualTo(original);
+	}
+}