Cleaned up logging. No need for secure-logs.

Author: flexable777

deploy/nais.yaml

@@ -63,8 +63,6 @@ spec:
   prometheus:
     enabled: true
     path: /internal/prometheus
-  secureLogs:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

src/main/kotlin/no/nav/klage/document/api/CommentsController.kt

@@ -10,7 +10,6 @@ import no.nav.klage.document.config.SecurityConfiguration.Companion.ISSUER_AAD
 import no.nav.klage.document.domain.Comment
 import no.nav.klage.document.service.CommentService
 import no.nav.klage.document.util.getLogger
-import no.nav.klage.document.util.getSecureLogger
 import no.nav.security.token.support.core.api.ProtectedWithClaims
 import no.nav.security.token.support.core.context.TokenValidationContextHolder
 import org.springframework.web.bind.annotation.*
@@ -28,7 +27,6 @@ class CommentsController(
     companion object {
         @Suppress("JAVA_CLASS_ON_COMPANION")
         private val logger = getLogger(javaClass.enclosingClass)
-        private val secureLogger = getSecureLogger()
     }
 
     @Operation(
@@ -161,8 +159,7 @@ class CommentsController(
         )
 
     private fun log(message: String) {
-        logger.debug(message)
-        secureLogger.debug("{}. On-behalf-of: {}", message, getIdent())
+        logger.debug("{}. On-behalf-of: {}", message, getIdent())
     }
 
     fun getIdent(): String? =

src/main/kotlin/no/nav/klage/document/api/DocumentController.kt

@@ -9,7 +9,6 @@ import no.nav.klage.document.config.SecurityConfiguration.Companion.ISSUER_AAD
 import no.nav.klage.document.service.DocumentService
 import no.nav.klage.document.util.TokenUtil
 import no.nav.klage.document.util.getLogger
-import no.nav.klage.document.util.getSecureLogger
 import no.nav.security.token.support.core.api.ProtectedWithClaims
 import org.springframework.web.bind.annotation.*
 import java.util.*
@@ -26,7 +25,6 @@ class DocumentController(
     companion object {
         @Suppress("JAVA_CLASS_ON_COMPANION")
         private val logger = getLogger(javaClass.enclosingClass)
-        private val secureLogger = getSecureLogger()
     }
 
     @Operation(
@@ -38,7 +36,6 @@ class DocumentController(
         @RequestBody input: DocumentUpdateInput,
     ): DocumentView {
         log("createDocument")
-        secureLogger.debug("createDocument: received json: {}", input.json)
         return documentService.createDocument(json = input.json, data = input.data)
     }
 
@@ -52,12 +49,6 @@ class DocumentController(
         @RequestBody input: DocumentUpdateInput,
     ): DocumentView {
         log("updateDocument called with id $documentId")
-        secureLogger.debug(
-            "updateDocument with id {}: current FE version: {} received json: {}",
-            documentId,
-            input.currentVersion,
-            input.json
-        )
 
         return try {
             documentService.updateDocument(
@@ -112,8 +103,7 @@ class DocumentController(
     }
 
     private fun log(message: String) {
-        logger.debug(message)
-        secureLogger.debug("{}. On-behalf-of: {}", message, tokenUtil.getIdentNullable())
+        logger.debug("{}. On-behalf-of: {}", message, tokenUtil.getIdentNullable())
     }
 
 }

src/main/kotlin/no/nav/klage/document/config/ProblemHandlingControllerAdvice.kt

@@ -1,7 +1,7 @@
 package no.nav.klage.document.config
 
 import no.nav.klage.document.exceptions.MissingAccessException
-import no.nav.klage.document.util.getSecureLogger
+import no.nav.klage.document.util.getLogger
 import org.springframework.http.HttpStatus
 import org.springframework.http.ProblemDetail
 import org.springframework.orm.jpa.JpaObjectRetrievalFailureException
@@ -14,20 +14,19 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
 class ProblemHandlingControllerAdvice : ResponseEntityExceptionHandler() {
 
     companion object {
-        private val secureLogger = getSecureLogger()
+        @Suppress("JAVA_CLASS_ON_COMPANION")
+        private val ourLogger = getLogger(javaClass.enclosingClass)
     }
 
     @ExceptionHandler
     fun handleEntityNotFound(
         ex: JpaObjectRetrievalFailureException,
-        request: NativeWebRequest
     ): ProblemDetail =
         create(HttpStatus.NOT_FOUND, ex)
 
     @ExceptionHandler
     fun handleMissingAccess(
         ex: MissingAccessException,
-        request: NativeWebRequest
     ): ProblemDetail =
         create(HttpStatus.FORBIDDEN, ex)
 
@@ -48,11 +47,11 @@ class ProblemHandlingControllerAdvice : ResponseEntityExceptionHandler() {
     private fun logError(httpStatus: HttpStatus, errorMessage: String, exception: Exception) {
         when {
             httpStatus.is5xxServerError -> {
-                secureLogger.error("Exception thrown to client: ${httpStatus.reasonPhrase}, $errorMessage", exception)
+                ourLogger.error("Exception thrown to client: ${httpStatus.reasonPhrase}, $errorMessage", exception)
             }
 
             else -> {
-                secureLogger.warn("Exception thrown to client: ${httpStatus.reasonPhrase}, $errorMessage", exception)
+                ourLogger.warn("Exception thrown to client: ${httpStatus.reasonPhrase}, $errorMessage", exception)
             }
         }
     }

src/main/kotlin/no/nav/klage/document/config/RequestLoggingConfig.kt

@@ -12,7 +12,7 @@ class RequestLoggingConfig {
         val filter = CommonsRequestLoggingFilter()
         filter.setIncludeQueryString(true)
         filter.setIncludePayload(false)
-        filter.setIncludeHeaders(true)
+        filter.setIncludeHeaders(false)
         filter.setIncludeClientInfo(true)
         return filter
     }

src/main/kotlin/no/nav/klage/document/service/DocumentService.kt

@@ -12,7 +12,6 @@ import no.nav.klage.document.repositories.DocumentVersionRepository
 import no.nav.klage.document.repositories.LatestDocumentVersionRepository
 import no.nav.klage.document.util.TokenUtil
 import no.nav.klage.document.util.getLogger
-import no.nav.klage.document.util.getSecureLogger
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDateTime
@@ -31,7 +30,6 @@ class DocumentService(
     companion object {
         @Suppress("JAVA_CLASS_ON_COMPANION")
         private val logger = getLogger(javaClass.enclosingClass)
-        private val secureLogger = getSecureLogger()
     }
 
     fun createDocument(json: String, data: String?): DocumentView {

src/main/kotlin/no/nav/klage/document/util/LoggerUtils.kt

@@ -3,6 +3,4 @@ package no.nav.klage.document.util
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-fun getLogger(forClass: Class<*>): Logger = LoggerFactory.getLogger(forClass)
-
-fun getSecureLogger(): Logger = LoggerFactory.getLogger("secure")
+fun getLogger(forClass: Class<*>): Logger = LoggerFactory.getLogger(forClass)

src/main/kotlin/no/nav/klage/document/util/TokenUtil.kt

@@ -12,7 +12,6 @@ class TokenUtil(
     companion object {
         @Suppress("JAVA_CLASS_ON_COMPANION")
         private val logger = getLogger(javaClass.enclosingClass)
-        private val securelogger = getSecureLogger()
     }
 
     fun getIdent(): String =

src/main/resources/logback-spring.xml

@@ -10,10 +10,6 @@
             </encoder>
         </appender>
 
-        <logger name="secure" level="debug" additivity="false">
-            <appender-ref ref="text"/>
-        </logger>
-
         <root level="info">
             <appender-ref ref="text"/>
         </root>
@@ -22,23 +18,6 @@
     </springProfile>
 
     <springProfile name="!local">
-        <appender name="secureJson" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <file>/secure-logs/secure.log</file>
-            <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                <fileNamePattern>/secure-logs/secure.log.%i</fileNamePattern>
-                <minIndex>1</minIndex>
-                <maxIndex>1</maxIndex>
-            </rollingPolicy>
-            <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                <maxFileSize>50MB</maxFileSize>
-            </triggeringPolicy>
-            <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
-        </appender>
-
-        <logger name="secure" level="debug" additivity="false">
-            <appender-ref ref="secureJson"/>
-        </logger>
-
         <appender name="json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
         </appender>
@@ -48,23 +27,14 @@
         </root>
 
         <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug" additivity="false">
-            <appender-ref ref="secureJson"/>
-        </logger>
-
-        <logger name="reactor.netty.http.client" level="debug" additivity="false">
-            <appender-ref ref="secureJson"/>
-        </logger>
-
-        <logger name="org.springframework.data.elasticsearch.client" level="trace" additivity="false">
-            <appender-ref ref="secureJson"/>
+            <appender-ref ref="json"/>
         </logger>
 
         <logger name="org.springframework.data.convert.CustomConversions" level="error"/>
 
         <logger name="no.nav.security.token.support.spring.validation.interceptor.JwtTokenHandlerInterceptor"
                 level="warning"/>
 
-        <logger name="io.micrometer.influx" level="debug"/>
     </springProfile>
 
     <logger name="no.nav.klage" level="debug"/>