From b324b58269e04a7039c35e3e6be6082bfa6e0740 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sun, 27 Jul 2025 23:40:52 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=97=90=20?= =?UTF-8?q?=EB=84=A3=EC=97=88=EB=8D=98=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20log=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B3=B5=ED=86=B5=20=EB=B3=80=EC=88=98=20=EC=83=81?= =?UTF-8?q?=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/log/RoomescapeLogMaskingConverter.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt b/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt index cb12be26..58e41174 100644 --- a/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt +++ b/src/main/kotlin/roomescape/common/log/RoomescapeLogMaskingConverter.kt @@ -7,20 +7,16 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.node.TextNode -import io.github.oshai.kotlinlogging.KLogger -import io.github.oshai.kotlinlogging.KotlinLogging import roomescape.common.config.JacksonConfig +private const val MASK: String = "****" private val SENSITIVE_KEYS = setOf("password", "accessToken") -private val log: KLogger = KotlinLogging.logger {} class RoomescapeLogMaskingConverter( private val objectMapper: ObjectMapper = JacksonConfig().objectMapper() ) : MessageConverter() { - override fun convert(event: ILoggingEvent): String { val message: String = event.formattedMessage - log.warn { "[RoomescapeLogMaskingConverter.convert] formattedMessage: $message" } return if (isJsonString(message)) { maskedJsonString(message) @@ -47,7 +43,7 @@ class RoomescapeLogMaskingConverter( val key = matchResult.groupValues[1] val delimiter = matchResult.groupValues[2] - "${key}${delimiter}****" + "${key}${delimiter}${MASK}" } } @@ -55,7 +51,7 @@ class RoomescapeLogMaskingConverter( node?.forEachEntry { key, childNode -> when { childNode.isValueNode -> { - if (key in SENSITIVE_KEYS) (node as ObjectNode).put(key, "****") + if (key in SENSITIVE_KEYS) (node as ObjectNode).put(key, MASK) } childNode.isObject -> maskRecursive(childNode)