Oppdatert deprecated securityconfig for alle applikasjoner

navikt · Oct 17, 2023 · 05e3710 · 05e3710
1 parent 640cb8a
commit 05e3710
Show file tree

Hide file tree

Showing 133 changed files with 351 additions and 496 deletions.
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -67,7 +67,7 @@ dependencies {
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.aspectj:aspectjweaver:1.9.7'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 

diff --git a/...resse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java b/...resse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java
@@ -18,11 +18,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -31,11 +29,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -73,7 +73,7 @@ dependencies {
 
     implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     implementation 'org.flywaydb:flyway-core'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 

diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle
@@ -75,7 +75,7 @@ dependencies {
 
     implementation 'org.hibernate.validator:hibernate-validator'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     runtimeOnly 'com.oracle.database.jdbc:ojdbc8'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/...ain/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java b/...ain/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java
@@ -16,11 +16,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -29,11 +27,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -83,7 +83,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     implementation 'org.hibernate.validator:hibernate-validator'
 

diff --git a/.../src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java b/.../src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java
@@ -19,11 +19,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -32,11 +30,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/...src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java b/...src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java
@@ -16,11 +16,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -29,11 +27,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -105,7 +105,7 @@ dependencies {
 
     implementation 'org.apache.cxf:cxf-rt-frontend-jaxws:3.5.5'
     implementation 'wsdl4j:wsdl4j:1.6.3'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'javax.validation:validation-api:2.0.1.Final'
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.15'

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     implementation 'io.r2dbc:r2dbc-h2'

diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
@@ -1,15 +1,11 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.1.2'
-    id 'io.spring.dependency-management' version '1.1.2'
+    id 'org.springframework.boot' version '3.1.4'
+    id 'io.spring.dependency-management' version '1.1.3'
     id "jacoco"
     id "org.sonarqube" version "4.0.0.2929"
 }
 
-java {
-    sourceCompatibility = '17'
-}
-
 bootJar {
     archiveFileName = "app.jar"
     mainClass = 'no.nav.dolly.budpro.BudproServiceApplication'
@@ -21,6 +17,12 @@ configurations {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 repositories {
     mavenCentral()
     mavenLocal()

diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -85,7 +85,7 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
@@ -43,7 +43,7 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 java {

diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'

diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/...src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java b/...src/main/java/no/nav/registre/testnorge/eregbatchstatusservice/config/SecurityConfig.java
@@ -16,11 +16,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -29,11 +27,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
     implementation 'org.hibernate.validator:hibernate-validator'

diff --git a/...no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java b/...no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/SecurityConfig.java
@@ -17,11 +17,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -30,11 +28,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }

diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/...ice/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java b/...ice/src/main/java/no/nav/registre/testnorge/generernavnservice/config/SecurityConfig.java
@@ -16,11 +16,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
 
-        httpSecurity.sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().csrf().disable()
-                .authorizeHttpRequests()
-                .requestMatchers(
+        httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .csrf(csrfSpec -> csrfSpec.disable())
+                .authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
                         "/internal/**",
                         "/webjars/**",
                         "/swagger-resources/**",
@@ -29,11 +27,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
                         "/swagger",
                         "/error",
                         "/swagger-ui.html"
-                ).permitAll()
-                .requestMatchers("/api/**").fullyAuthenticated()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                ).permitAll().requestMatchers("/api/**").fullyAuthenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtConfigurer -> {
+                }));
 
         return httpSecurity.build();
     }