Skip to content

feat: don't ignore endpoint request for Spring csrf check #908

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

Merged
merged 7 commits into from
Oct 11, 2021
Merged

feat: don't ignore endpoint request for Spring csrf check #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3d1761
feat: don't ignore endpoint request for Spring csrf check
haijian-vaadin Sep 23, 2021
595ad21
Merge branch 'master' into haijian/reuse-spring-csrf
haijian-vaadin Sep 24, 2021
7e3fdaf
Merge branch 'master' into haijian/reuse-spring-csrf
platosha Oct 6, 2021
516fa09
Merge branch 'master' into haijian/reuse-spring-csrf
ZheSun88 Oct 7, 2021
f216f94
Merge branch 'master' into haijian/reuse-spring-csrf
ZheSun88 Oct 8, 2021
588df0f
Fix: await for logout in IT test application
platosha Oct 8, 2021
3c5e7be
Merge branch 'master' into haijian/reuse-spring-csrf
platosha Oct 11, 2021
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
4 changes: 2 additions & 2 deletions vaadin-spring-tests/test-spring-security-fusion/frontend/views/main-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ export class MainView extends Layout {
`;
}

private logout() {
logout();
private async logout() {
await logout();
Copy link

@platosha platosha Oct 11, 2021

Choose a reason for hiding this comment

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

Endpoint calls might be rejected for invalid CSRF during the brief period between the logout request and the logout response, which updates the CSRF token. This was causing an error in IT test.

The UI should await until the logout resolves before navigating to the logout success location.

Router.go(router.urlForName('public'));
}
private getMenuRoutes(): RouteInfo[] {
Expand Down
2 changes: 0 additions & 2 deletions ...ing/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurityConfigurerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ protected void configure(HttpSecurity http) throws Exception {
// Spring CSRF is not compatible with Vaadin internal requests
http.csrf().ignoringRequestMatchers(
requestUtil::isFrameworkInternalRequest);
// nor with endpoints
http.csrf().ignoringRequestMatchers(requestUtil::isEndpointRequest);

// Ensure automated requests to e.g. closing push channels, service
// workers,
Expand Down