Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/idporten cors #3653

Merged
merged 8 commits into from
Oct 15, 2024
Merged

Bugfix/idporten cors #3653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0fda081
* Cors endringer idporten
stigus Oct 14, 2024
10f6f9f
* Logger error
stigus Oct 14, 2024
6f80d0d
* Test
stigus Oct 14, 2024
d7b0ca6
* Test
stigus Oct 14, 2024
e1a0def
* Enda mer logging
stigus Oct 14, 2024
68d148d
* Deploy
stigus Oct 14, 2024
fe98e52
Merge branch 'master' into bugfix/idporten-cors
stigus Oct 14, 2024
c7f2563
Merge branch 'master' into bugfix/idporten-cors
krharum Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
.filters(filter, addUserJwtHeaderFilter())
).uri(host);
}
}
}
13 changes: 11 additions & 2 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/IdportenSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizationRequestResolver;
import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers;
import reactor.core.publisher.Mono;


@Slf4j
Expand Down Expand Up @@ -59,7 +60,8 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http, ServerOAuth2Aut
var logoutSuccessHandler = new LogoutSuccessHandler();
logoutSuccessHandler.applyOn("idporten", new IdportenOcidLogoutUrlResolver(wellKnownUrl, postLogoutRedirectUri));

return http.cors(ServerHttpSecurity.CorsSpec::disable)
return http
.cors(ServerHttpSecurity.CorsSpec::disable)
.csrf(ServerHttpSecurity.CsrfSpec::disable)
.authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.pathMatchers(
"/internal/isReady",
Expand All @@ -78,10 +80,17 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http, ServerOAuth2Aut
).permitAll()
.anyExchange().authenticated())
.oauth2Login(oAuth2LoginSpec -> oAuth2LoginSpec
.authenticationFailureHandler((webFilterExchange, exception) -> {
log.error("Failed to authenticate user", exception);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Supert 👍

return Mono.error(exception);
})
.authenticationManager(authenticationManager)
.authorizationRequestResolver(requestResolver)
.authenticationSuccessHandler(authenticationSuccessHandler))
.formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN))
.formLogin(formLoginSpec -> formLoginSpec.loginPage(LOGIN).authenticationFailureHandler((webFilterExchange, exception) -> {
log.error("Failed to authenticate user", exception);
return Mono.error(exception);
}))
.logout(logoutSpec -> logoutSpec
.logoutUrl(LOGOUT)
.requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, LOGOUT))
Expand Down
9 changes: 4 additions & 5 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/LogController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import no.nav.dolly.web.domain.LogEvent;
import no.nav.dolly.web.provider.web.dto.LogEventDTO;
import no.nav.dolly.web.service.LogService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
Expand All @@ -12,10 +15,6 @@
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;

import no.nav.dolly.web.domain.LogEvent;
import no.nav.dolly.web.provider.web.dto.LogEventDTO;
import no.nav.dolly.web.service.LogService;


@Slf4j
@RestController
Expand All @@ -34,6 +33,6 @@ public Mono<ResponseEntity<HttpStatus>> logg(
) {
return logService
.log(new LogEvent(dto, userAgent, host), exchange)
.map(response -> ResponseEntity.noContent().build());
.then(Mono.fromCallable(() -> ResponseEntity.noContent().build()));
}
}
2 changes: 2 additions & 0 deletions apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public Mono<ResponseEntity<?>> delete(ServerWebExchange exchange) {
public Mono<ResponseEntity<?>> addUserToSession(@RequestParam String organisasjonsnummer, ServerWebExchange exchange) {
return personOrganisasjonTilgangConsumer
.hasAccess(organisasjonsnummer, exchange)
.doOnError(e -> log.error("Feil ved sjekk av tilgang til org {}", organisasjonsnummer, e))
.flatMap(hasAccess -> {
if (Boolean.FALSE.equals(hasAccess)) {
log.error("Bruker mangler tilgang til org {}", organisasjonsnummer);
Expand All @@ -55,6 +56,7 @@ public Mono<ResponseEntity<?>> addUserToSession(@RequestParam String organisasjo
}
return brukerService.getId(organisasjonsnummer, exchange).flatMap(id -> exchange
.getSession()
.doOnError(e -> log.error("Feil ved lagring av bruker i session", e))
.doOnSuccess(session -> session.getAttributes().put(UserSessionConstant.SESSION_USER_ID_KEY, id))
.map(value -> ResponseEntity.ok().build())
).switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
Expand Down
12 changes: 6 additions & 6 deletions apps/dolly-frontend/src/main/js/src/RootComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ const ErrorView = () => {
}

export const RootComponent = () => (
<Provider store={store}>
<Router history={history}>
<ErrorBoundary>
<ErrorBoundary>
<Provider store={store}>
<Router history={history}>
<SWRConfig
value={{
dedupingInterval: 5000,
Expand All @@ -82,7 +82,7 @@ export const RootComponent = () => (
<Route errorElement={<ErrorView />} path="*" element={<App />} />
</FaroRoutes>
</SWRConfig>
</ErrorBoundary>
</Router>
</Provider>
</Router>
</Provider>
</ErrorBoundary>
)
3 changes: 2 additions & 1 deletion apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ export const AppError = ({ error, stackTrace, style }: Props) => {
]

useEffect(() => {
console.error('Ukjent error i Dolly: ' + error)
if (errorsRequiringReload.some((e) => error?.toString()?.includes(e))) {
navigate(0)
}
}, [])
}, [error])

return (
<div className="application-error" style={style}>
Expand Down
2 changes: 1 addition & 1 deletion apps/dolly-frontend/src/main/js/src/components/utlogging/navigateToLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const navigateToLogin = (feilmelding?: string) => {
console.error(feilmelding)
console.error('Ukjent feil i Dolly, feilmelding: ' + feilmelding)
window.location.href = '/login'
}
3 changes: 3 additions & 0 deletions apps/dolly-frontend/src/main/js/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ export default defineConfig(({ mode }) => ({
outDir: 'build',
sourcemap: true,
cssCodeSplit: false,
rollupOptions: {
external: ['./nais.js'],
},
},
optimizeDeps: { exclude: ['node_modules/.cache'] },
resolve: {
Expand Down
Loading