Skip to content

Commit

Permalink
Oppdateringer, refaktorert SecurityConfig for resterende apper
Browse files Browse the repository at this point in the history 
Fikset KRR frontend til å tydelig vise hva som godtas på mobilnr format
Endret Pensjon FraOgMed til å kun gi gyldige alternativer, altså år fra og med ident er fylt sytten
#deploy-test-frontend
  • Loading branch information
@stigus
stigus committed Oct 26, 2023
1 parent 4661883 commit a303e5a
Show file tree
Hide file tree
Showing 66 changed files with 219 additions and 159 deletions.
3 changes: 2 additions & 1 deletion ...resse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;

Expand All @@ -20,7 +21,7 @@ public class SecurityConfig {
public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {

httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
"/internal/**",
"/webjars/**",
Expand Down
2 changes: 1 addition & 1 deletion ...-service/src/main/java/no/nav/registre/testnav/ameldingservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class SecurityConfig {
@Bean
public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
return httpSecurity
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
"/internal/**",
"/webjars/**",
Expand Down
2 changes: 1 addition & 1 deletion ...ice/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class SecurityConfig {
@Bean
public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
return httpSecurity
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
"/internal/**",
"/webjars/**",
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/no/nav/no/registere/testnorge/arbeidsforholdexportapi/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;

Expand All @@ -18,7 +19,7 @@ public class SecurityConfig {
public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {

httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
"/internal/**",
"/webjars/**",
Expand Down
3 changes: 2 additions & 1 deletion .../src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;

Expand All @@ -21,7 +22,7 @@ public class SecurityConfig {
public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {

httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
"/internal/**",
"/webjars/**",
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;

Expand All @@ -18,7 +19,7 @@ public class SecurityConfig {
public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {

httpSecurity.sessionManagement(sessionConfig -> sessionConfig.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(authorizeConfig -> authorizeConfig.requestMatchers(
"/internal/**",
"/webjars/**",
Expand Down
2 changes: 1 addition & 1 deletion ...bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class SecurityConfig {
@Bean
public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
return httpSecurity
.csrf(csrfSpec -> csrfSpec.disable())
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
"/internal/**",
"/webjars/**",
Expand Down
44 changes: 21 additions & 23 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/IdportenSecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,34 +48,32 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
var logoutSuccessHandler = new LogoutSuccessHandler();
logoutSuccessHandler.applyOn("idporten", new IdportenOcidLogoutUrlResolver(wellKnownUrl, postLogoutRedirectUri));

return http.cors()
.and().csrf().disable()
.authorizeExchange()
.pathMatchers(
"/internal/isReady",
"/internal/isAlive",
"/assets/*",
"/internal/metrics",
"/oauth2/callback",
"/favicon.ico",
LOGIN,
LOGOUT,
"/oauth2/logout",
"/*.css",
"/*.js",
"/*.mjs",
"/*.png"
).permitAll()
.anyExchange().authenticated()
.and().oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
return http.cors(ServerHttpSecurity.CorsSpec::disable)
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.pathMatchers(
"/internal/isReady",
"/internal/isAlive",
"/assets/*",
"/internal/metrics",
"/oauth2/callback",
"/favicon.ico",
LOGIN,
LOGOUT,
"/oauth2/logout",
"/*.css",
"/*.js",
"/*.mjs",
"/*.png"
).permitAll()
.anyExchange().authenticated())
.oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
.authenticationManager(authenticationManger)
.authenticationSuccessHandler(authenticationSuccessHandler))
.formLogin().loginPage(LOGIN)
.and().logout(logoutSpec -> logoutSpec
.formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN))
.logout(logoutSpec -> logoutSpec
.logoutUrl(LOGOUT)
.requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, LOGOUT))
.logoutSuccessHandler(logoutSuccessHandler))
.build();
}

}
43 changes: 21 additions & 22 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalSecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,28 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
var authenticationSuccessHandler = new DollyAuthenticationSuccessHandler();
var logoutSuccessHandler = new LogoutSuccessHandler();

return http.cors()
.and().csrf().disable()
.authorizeExchange()
.pathMatchers(
"/internal/isReady",
"/internal/isAlive",
"/assets/*",
"/internal/metrics",
"/oauth2/callback",
"/favicon.ico",
LOGIN,
LOGOUT,
"/oauth2/logout",
"/*.css",
"/*.js",
"/*.mjs",
"/*.png"
).permitAll()
.anyExchange().authenticated()
.and().oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
return http.cors(ServerHttpSecurity.CorsSpec::disable)
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.pathMatchers(
"/internal/isReady",
"/internal/isAlive",
"/assets/*",
"/internal/metrics",
"/oauth2/callback",
"/favicon.ico",
LOGIN,
LOGOUT,
"/oauth2/logout",
"/*.css",
"/*.js",
"/*.mjs",
"/*.png"
).permitAll()
.anyExchange().authenticated())
.oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
.authenticationSuccessHandler(authenticationSuccessHandler))
.formLogin().loginPage(LOGIN)
.and().logout(logoutSpec -> logoutSpec
.formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN))
.logout(logoutSpec -> logoutSpec
.logoutUrl(LOGOUT)
.requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, LOGOUT))
.logoutSuccessHandler(logoutSuccessHandler))
Expand Down
10 changes: 4 additions & 6 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ public class SecurityConfig {
@Bean
public SecurityWebFilterChain configure(ServerHttpSecurity http) {

http.cors()
.and().csrf().disable()
.authorizeExchange()
.anyExchange()
.permitAll()
.and().oauth2ResourceServer().jwt(jwt -> jwtDecoder());
http.cors(ServerHttpSecurity.CorsSpec::disable)
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.anyExchange().permitAll())
.oauth2ResourceServer(oAuth2ResourceServerSpec -> oAuth2ResourceServerSpec.jwt(jwtSpec -> jwtDecoder()));
return http.build();
}

Expand Down
67 changes: 35 additions & 32 deletions apps/dolly-frontend/src/main/js/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/dolly-frontend/src/main/js/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dolly",
"version": "2.5.27",
"version": "2.5.28",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/Form.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export const KrrstubForm = ({ formikBag }: KrrstubFormProps) => {
fastfield={false}
/>
<FormikTextInput name="krrstub.epost" label="E-post" />
TODO: FIKSE DENNE TIL Å VISE TYDELIG AT +47xxx ER RIKTIG FORMAT
<FormikTextInput
name="krrstub.mobil"
label="Mobilnummer (+47)"
Expand Down
Loading

0 comments on commit a303e5a

Please sign in to comment.