diff --git a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java index ea53230..67aa692 100644 --- a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java +++ b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java @@ -6,6 +6,7 @@ import com.kri.common.feature.util.StringUtil; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.template.TemplateBasicDto; import java.nio.charset.StandardCharsets; +import java.util.regex.Pattern; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.safety.Safelist; @@ -15,6 +16,10 @@ public final class TemplateContentSanitizer { // 필요 시 시스템 정책에 맞게 조정 // (KOR 환경에서 SMS는 바이트 기준으로 제한을 두는 경우가 흔함) private static final int SMS_MAX_BYTES_UTF8 = 90; + private static final Pattern ESCAPED_QRCODE_OPEN_TAG_PATTERN = + Pattern.compile("(?i)<\\s*qrcode\\b([\\s\\S]*?)/?\\s*>"); + private static final Pattern ESCAPED_QRCODE_CLOSE_TAG_PATTERN = + Pattern.compile("(?i)</\\s*qrcode\\s*>"); private TemplateContentSanitizer() { } @@ -68,7 +73,16 @@ public final class TemplateContentSanitizer { return null; } + html = normalizeEscapedQrcodeTags(html); + Safelist safelist = Safelist.relaxed() + .addTags("mark") + .addAttributes("mark", "style", "data-color") + .addAttributes("p", "style") + .addAttributes("span", "style") + .addAttributes("div", "style") + .addTags("qrcode") + .addAttributes("qrcode", "src", "width", "height", "alt") .addProtocols("a", "href", "http", "https", "mailto") .addProtocols("img", "src", "http", "https"); @@ -79,6 +93,12 @@ public final class TemplateContentSanitizer { return cleaned.trim(); } + private static String normalizeEscapedQrcodeTags(String html) { + String normalized = ESCAPED_QRCODE_OPEN_TAG_PATTERN.matcher(html) + .replaceAll(""); + return ESCAPED_QRCODE_CLOSE_TAG_PATTERN.matcher(normalized).replaceAll(""); + } + /** * SMS/LMS body: HTML -> 평문(개행 보존) */ diff --git a/src/main/java/com/kri/notihub/server/controller/TemplateController.java b/src/main/java/com/kri/notihub/server/controller/TemplateController.java index 39b00f8..7ffd7c8 100644 --- a/src/main/java/com/kri/notihub/server/controller/TemplateController.java +++ b/src/main/java/com/kri/notihub/server/controller/TemplateController.java @@ -71,7 +71,7 @@ public class TemplateController { return newTmplat; } - @Operation(summary = "시나리오 이미지 업로드") + @Operation(summary = "바디에 사용하는 이미지 업로드") @PutMapping("/body-image/{itrntPrjctCd}") public String uploadContactSenarioImage(@PathVariable String itrntPrjctCd, @RequestParam("file") MultipartFile file) { diff --git a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java index eca4811..e0810e7 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java @@ -31,6 +31,7 @@ public abstract class AbstractPringoSendService extends AbstractSendService { private final PringoApiClient pringoApiClient; private final EmailResultPoller emailResultPoller; + private final EmailBodyRenderer emailBodyRenderer; protected AbstractPringoSendService( SendBulkJdbcWriter sendBulkJdbcWriter, @@ -39,11 +40,13 @@ public abstract class AbstractPringoSendService extends AbstractSendService { SendRepository sendRepository, TemplateService templateService, PringoApiClient pringoApiClient, - EmailResultPoller emailResultPoller + EmailResultPoller emailResultPoller, + EmailBodyRenderer emailBodyRenderer ) { super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService); this.pringoApiClient = pringoApiClient; this.emailResultPoller = emailResultPoller; + this.emailBodyRenderer = emailBodyRenderer; } protected abstract ChannelType defaultChannelType(); @@ -53,6 +56,11 @@ public abstract class AbstractPringoSendService extends AbstractSendService { return defaultChannelType(); } + @Override + protected String renderMessageBody(String body, Map msgParam) { + return emailBodyRenderer.render(body, msgParam); + } + @Override protected SendInternalResultDto doSendInternal( Boolean isResve, diff --git a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java index d16996c..95b11b2 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java @@ -133,7 +133,7 @@ public abstract class AbstractSendService { } String msgTitle = replacePlaceholder(tmplat.getTmplatTitle(), dest.getMsgParam()); - String msgBody = replacePlaceholder(tmplat.getTmplatBody(), dest.getMsgParam()); + String msgBody = renderMessageBody(tmplat.getTmplatBody(), dest.getMsgParam()); SendInternalResultDto sendResult = doSendInternal( req.getResve(), @@ -237,7 +237,7 @@ public abstract class AbstractSendService { } String msgTitle = replacePlaceholder(tmplat.getTmplatTitle(), dest.getMsgParam()); - String msgBody = replacePlaceholder(tmplat.getTmplatBody(), dest.getMsgParam()); + String msgBody = renderMessageBody(tmplat.getTmplatBody(), dest.getMsgParam()); SendInternalResultDto sendResult = doSendInternal( isResve, @@ -318,6 +318,10 @@ public abstract class AbstractSendService { return sb.toString(); } + protected String renderMessageBody(String body, Map msgParam) { + return replacePlaceholder(body, msgParam); + } + /** * 자식 클래스가 구현: 실제 발송 수행 */ diff --git a/src/main/java/com/kri/notihub/server/service/EmailBodyRenderer.java b/src/main/java/com/kri/notihub/server/service/EmailBodyRenderer.java new file mode 100644 index 0000000..0be1663 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/service/EmailBodyRenderer.java @@ -0,0 +1,126 @@ +package com.kri.notihub.server.service; + +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class EmailBodyRenderer { + + private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("(?:\\[\\$|#\\{)([^\\]}]+)(?:]|})"); + private static final Pattern UNRESOLVED_PLACEHOLDER_PATTERN = Pattern.compile("(?:\\[\\$|#\\{)[^\\]}]+(?:]|})"); + private static final Pattern ESCAPED_QRCODE_OPEN_TAG_PATTERN = + Pattern.compile("(?i)<\\s*qrcode\\b([\\s\\S]*?)/?\\s*>"); + private static final Pattern ESCAPED_QRCODE_CLOSE_TAG_PATTERN = + Pattern.compile("(?i)</\\s*qrcode\\s*>"); + private static final Pattern QRCODE_OPEN_TAG_PATTERN = Pattern.compile("(?i)<\\s*qrcode\\b([^>]*)/?>"); + private static final Pattern QRCODE_CLOSE_TAG_PATTERN = Pattern.compile("(?i)"); + private final String qrPublicBaseUrl; + + public EmailBodyRenderer(@Value("${kri.qr.public-base-url}") String qrPublicBaseUrl) { + this.qrPublicBaseUrl = qrPublicBaseUrl.endsWith("/") + ? qrPublicBaseUrl.substring(0, qrPublicBaseUrl.length() - 1) + : qrPublicBaseUrl; + } + + public String render(String html, Map msgParam) { + String preparedHtml = replaceQrcodeTagsWithImages(html); + String replacedHtml = replacePlaceholder(preparedHtml, msgParam); + return replaceQrcodeImagesWithApiUrls(replacedHtml); + } + + private String replaceQrcodeTagsWithImages(String html) { + if (html == null || html.isEmpty()) { + return html; + } + + String normalizedHtml = normalizeQrcodeTags(html); + Document doc = Jsoup.parseBodyFragment(normalizedHtml); + doc.outputSettings(new Document.OutputSettings().prettyPrint(false)); + + return doc.body().html(); + } + + private String normalizeQrcodeTags(String html) { + String normalized = ESCAPED_QRCODE_OPEN_TAG_PATTERN.matcher(html) + .replaceAll(""); + normalized = ESCAPED_QRCODE_CLOSE_TAG_PATTERN.matcher(normalized).replaceAll(""); + normalized = QRCODE_OPEN_TAG_PATTERN.matcher(normalized) + .replaceAll(""); + return QRCODE_CLOSE_TAG_PATTERN.matcher(normalized).replaceAll(""); + } + + private String replaceQrcodeImagesWithApiUrls(String html) { + if (html == null || html.isEmpty()) { + return html; + } + + Document doc = Jsoup.parseBodyFragment(html); + doc.outputSettings(new Document.OutputSettings().prettyPrint(false)); + + for (Element img : doc.select("img[data-qrcode=true]")) { + String qrText = img.attr("src"); + if (!isValidQrUrl(qrText)) { + img.remove(); + continue; + } + + String encodedUrl = Base64.getUrlEncoder().withoutPadding() + .encodeToString(qrText.getBytes(StandardCharsets.UTF_8)); + img.attr("src", qrPublicBaseUrl + "/" + encodedUrl); + img.removeAttr("data-qrcode"); + } + + return doc.body().html(); + } + + private String replacePlaceholder(String text, Map msgParam) { + if (text == null || text.isEmpty() || msgParam == null || msgParam.isEmpty()) { + return text; + } + + Matcher matcher = PLACEHOLDER_PATTERN.matcher(text); + StringBuilder sb = new StringBuilder(); + while (matcher.find()) { + String varName = matcher.group(1); + String value = msgParam.get(varName); + + if (value == null) { + matcher.appendReplacement(sb, Matcher.quoteReplacement(matcher.group(0))); + } else { + matcher.appendReplacement(sb, Matcher.quoteReplacement(value)); + } + } + matcher.appendTail(sb); + + return sb.toString(); + } + + private boolean isValidQrUrl(String value) { + if (value == null || value.isBlank()) { + return false; + } + if (UNRESOLVED_PLACEHOLDER_PATTERN.matcher(value).find()) { + return false; + } + + try { + URI uri = new URI(value); + String scheme = uri.getScheme(); + return ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme)) + && uri.getHost() != null + && !uri.getHost().isBlank(); + } catch (URISyntaxException e) { + return false; + } + } +} diff --git a/src/main/java/com/kri/notihub/server/service/ReportService.java b/src/main/java/com/kri/notihub/server/service/ReportService.java index 8361cc6..b69d546 100644 --- a/src/main/java/com/kri/notihub/server/service/ReportService.java +++ b/src/main/java/com/kri/notihub/server/service/ReportService.java @@ -1,7 +1,6 @@ package com.kri.notihub.server.service; import com.kri.common.feature.excel.ExcelMapper; -import com.kri.common.feature.excel.ExcelUtil; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.page.PageRequestDto; import com.kri.common.feature.web.page.PageResponseDto; @@ -31,7 +30,6 @@ import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; import com.kri.notihub.server.persistence.repository.SendResultCodeRepository; import com.kri.notihub.server.persistence.repository.UnitPriceRepository; -import jakarta.validation.Valid; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.math.BigDecimal; diff --git a/src/main/java/com/kri/notihub/server/service/SendEmailService.java b/src/main/java/com/kri/notihub/server/service/SendEmailService.java index cdc0683..9c512b1 100644 --- a/src/main/java/com/kri/notihub/server/service/SendEmailService.java +++ b/src/main/java/com/kri/notihub/server/service/SendEmailService.java @@ -20,9 +20,11 @@ public class SendEmailService extends AbstractPringoSendService { SendRepository sendRepository, TemplateService templateService, PringoApiClient pringoApiClient, - EmailResultPoller emailResultPoller + EmailResultPoller emailResultPoller, + EmailBodyRenderer emailBodyRenderer ) { - super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService, pringoApiClient, emailResultPoller); + super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService, + pringoApiClient, emailResultPoller, emailBodyRenderer); } @Override diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b7877fa..7c2ff84 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -18,4 +18,4 @@ spring: url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_notihub password: notihub#51304 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 13e7c5d..efadb4d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -34,4 +34,4 @@ logging: level: org.hibernate.SQL: DEBUG org.hibernate.orm.jdbc.bind: TRACE - org.hibernate.orm.jdbc.extract: TRACE \ No newline at end of file + org.hibernate.orm.jdbc.extract: TRACE diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 1b14d7d..dd586b3 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -17,4 +17,4 @@ spring: url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_notihub password: notihub#51304 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ad3a9b1..9a198f2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -93,6 +93,9 @@ kri: temp-expire-hours: 24 temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) + qr: + public-base-url: https://short-url.kric.com/api/v1/qr + web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) redis: