Sett skjul fnr filter på message og ikke bare msg

navikt · Dec 13, 2024 · dce499f · dce499f
1 parent 2a2ed0c
commit dce499f
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 0 deletions.
diff --git a/apps/etterlatte-api/src/main/resources/logback.xml b/apps/etterlatte-api/src/main/resources/logback.xml
@@ -1,5 +1,7 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-behandling/src/main/resources/logback.xml b/apps/etterlatte-behandling/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-beregning-kafka/src/main/resources/logback.xml b/apps/etterlatte-beregning-kafka/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-beregning/src/main/resources/logback.xml b/apps/etterlatte-beregning/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-brev-api/src/main/resources/logback.xml b/apps/etterlatte-brev-api/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-brev-kafka/src/main/resources/logback.xml b/apps/etterlatte-brev-kafka/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-egne-ansatte-lytter/src/main/resources/logback.xml b/apps/etterlatte-egne-ansatte-lytter/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-grunnlag/logback.xml b/apps/etterlatte-grunnlag/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-grunnlag/src/main/resources/logback.xml b/apps/etterlatte-grunnlag/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-gyldig-soeknad/src/main/resources/logback.xml b/apps/etterlatte-gyldig-soeknad/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-hendelser-joark/src/main/resources/logback.xml b/apps/etterlatte-hendelser-joark/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-hendelser-pdl/src/main/resources/logback.xml b/apps/etterlatte-hendelser-pdl/src/main/resources/logback.xml
@@ -1,5 +1,7 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-hendelser-samordning/src/main/resources/logback.xml b/apps/etterlatte-hendelser-samordning/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-institusjonsopphold/src/main/resources/logback.xml b/apps/etterlatte-institusjonsopphold/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-tidshendelser/src/main/resources/logback.xml b/apps/etterlatte-tidshendelser/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-tilbakekreving/src/main/resources/logback.xml b/apps/etterlatte-tilbakekreving/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-trygdetid-kafka/src/main/resources/logback.xml b/apps/etterlatte-trygdetid-kafka/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-trygdetid/src/main/resources/logback.xml b/apps/etterlatte-trygdetid/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-utbetaling/src/main/resources/logback.xml b/apps/etterlatte-utbetaling/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-vedtaksvurdering-kafka/src/main/resources/logback.xml b/apps/etterlatte-vedtaksvurdering-kafka/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-vedtaksvurdering/src/main/resources/logback.xml b/apps/etterlatte-vedtaksvurdering/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/apps/etterlatte-vilkaarsvurdering-kafka/src/main/resources/logback.xml b/apps/etterlatte-vilkaarsvurdering-kafka/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
 <configuration>
     <conversionRule conversionWord="msg" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
+    <conversionRule conversionWord="message" converterClass="no.nav.etterlatte.libs.common.person.FnrCoverConverter"/>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>

diff --git a/libs/saksbehandling-common/src/main/kotlin/SkjulFnr.kt b/libs/saksbehandling-common/src/main/kotlin/SkjulFnr.kt
@@ -3,6 +3,9 @@ package no.nav.etterlatte.libs.common.person
 import ch.qos.logback.classic.pattern.MessageConverter
 import ch.qos.logback.classic.spi.ILoggingEvent
 
+/*
+    Denne brukes i logback.xml for å anonymisere fnr som randomly havner i loggene
+ */
 private val fnrRegex = Regex("\\b\\d{11}\\b")
 
 class FnrCoverConverter : MessageConverter() {