Skip to content

Commit ae5ecf6

Browse files
authored
FIX: Legger til inputvalidering av fritekst (#516)
1 parent a26e2cc commit ae5ecf6

File tree

5 files changed

+29
-0
lines changed

5 files changed

+29
-0
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package no.nav.k9.konstant;
2+
3+
public final class Patterns {
4+
public static final String FRITEKST =
5+
"^[\\p{Graph}\\p{IsWhite_Space}\\p{Sc}\\p{L}\\p{M}\\p{N}§]+$";
6+
7+
private Patterns() {
8+
}
9+
}

oppgave-ungdomsytelse/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<groupId>no.nav.k9</groupId>
1717
<artifactId>soknad</artifactId>
1818
</dependency>
19+
<dependency>
20+
<groupId>no.nav.k9</groupId>
21+
<artifactId>konstant</artifactId>
22+
<version>${revision}${sha1}${changelist}</version>
23+
</dependency>
1924
</dependencies>
2025

2126
</project>

oppgave-ungdomsytelse/src/main/java/no/nav/k9/oppgave/bekreftelse/ung/inntekt/InntektBekreftelse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import com.fasterxml.jackson.annotation.JsonCreator;
55
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
66
import com.fasterxml.jackson.annotation.JsonProperty;
7+
import jakarta.validation.constraints.Pattern;
8+
import jakarta.validation.constraints.Size;
9+
import no.nav.k9.konstant.Patterns;
710
import no.nav.k9.oppgave.bekreftelse.Bekreftelse;
811
import no.nav.k9.søknad.ytelse.DataBruktTilUtledning;
912

@@ -22,6 +25,8 @@ public class InntektBekreftelse implements Bekreftelse {
2225
private final boolean harBrukerGodtattEndringen;
2326

2427
@JsonProperty("uttalelseFraBruker")
28+
@Pattern(regexp = Patterns.FRITEKST, message = "[${validatedValue}] matcher ikke tillatt pattern [{regexp}]")
29+
@Size(max = 4000)
2530
private final String uttalelseFraBruker;
2631

2732
@JsonProperty("dataBruktTilUtledning")

oppgave-ungdomsytelse/src/main/java/no/nav/k9/oppgave/bekreftelse/ung/periodeendring/EndretSluttdatoBekreftelse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import jakarta.validation.constraints.Pattern;
6+
import jakarta.validation.constraints.Size;
7+
import no.nav.k9.konstant.Patterns;
58
import no.nav.k9.oppgave.bekreftelse.Bekreftelse;
69
import no.nav.k9.søknad.ytelse.DataBruktTilUtledning;
710

@@ -20,6 +23,8 @@ public class EndretSluttdatoBekreftelse implements Bekreftelse {
2023
private boolean harBrukerGodtattEndringen;
2124

2225
@JsonProperty("uttalelseFraBruker")
26+
@Pattern(regexp = Patterns.FRITEKST, message = "[${validatedValue}] matcher ikke tillatt pattern [{regexp}]")
27+
@Size(max = 4000)
2328
private String uttalelseFraBruker;
2429

2530
@JsonProperty("dataBruktTilUtledning")

oppgave-ungdomsytelse/src/main/java/no/nav/k9/oppgave/bekreftelse/ung/periodeendring/EndretStartdatoBekreftelse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import jakarta.validation.constraints.Pattern;
6+
import jakarta.validation.constraints.Size;
7+
import no.nav.k9.konstant.Patterns;
58
import no.nav.k9.oppgave.bekreftelse.Bekreftelse;
69
import no.nav.k9.søknad.felles.type.Periode;
710
import no.nav.k9.søknad.ytelse.DataBruktTilUtledning;
@@ -21,6 +24,8 @@ public class EndretStartdatoBekreftelse implements Bekreftelse {
2124
private boolean harBrukerGodtattEndringen;
2225

2326
@JsonProperty("uttalelseFraBruker")
27+
@Pattern(regexp = Patterns.FRITEKST, message = "[${validatedValue}] matcher ikke tillatt pattern [{regexp}]")
28+
@Size(max = 4000)
2429
private String uttalelseFraBruker;
2530

2631
@JsonProperty("dataBruktTilUtledning")

0 commit comments

Comments
 (0)