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)