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

fix: Use default XOR CSRF token mechanism in Spring #16521

Merged
merged 2 commits into from
Apr 3, 2023
Merged

fix: Use default XOR CSRF token mechanism in Spring #16521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d05b8
fix: Use default XOR CSRF token mechanism in Spring
Artur- Apr 2, 2023
ab3136a
Add comment
Artur- Apr 3, 2023
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
18 changes: 6 additions & 12 deletions vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
*/
package com.vaadin.flow.spring.security;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import javax.crypto.SecretKey;

import java.io.IOException;
import java.lang.reflect.Field;
import java.util.LinkedHashMap;
Expand All @@ -24,8 +30,6 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.crypto.SecretKey;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
Expand Down Expand Up @@ -54,7 +58,6 @@
import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
import org.springframework.security.web.context.SecurityContextRepository;
import org.springframework.security.web.csrf.CsrfException;
import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
import org.springframework.security.web.savedrequest.RequestCache;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
Expand All @@ -71,10 +74,6 @@
import com.vaadin.flow.server.auth.ViewAccessChecker;
import com.vaadin.flow.spring.security.stateless.VaadinStatelessSecurityConfigurer;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

/**
* Provides basic Vaadin component-based security configuration for the project.
* <p>
Expand Down Expand Up @@ -178,11 +177,6 @@ protected void configure(HttpSecurity http) throws Exception {
new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED),
requestUtil::isEndpointRequest);

// Enforce the deprecated CSRF handler temporarily
// to make Hilla auth work.
http.csrf(csrf -> csrf.csrfTokenRequestHandler(
new CsrfTokenRequestAttributeHandler()));

// Vaadin has its own CSRF protection.
// Spring CSRF is not compatible with Vaadin internal requests
http.csrf().ignoringRequestMatchers(
Expand Down
9 changes: 9 additions & 0 deletions ...ain/java/com/vaadin/flow/spring/security/stateless/VaadinStatelessSecurityConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
import org.springframework.security.web.context.SecurityContextRepository;
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import org.springframework.security.web.csrf.CsrfTokenRepository;
import org.springframework.security.web.csrf.CsrfTokenRequestHandler;
import org.springframework.security.web.csrf.LazyCsrfTokenRepository;
import org.springframework.security.web.csrf.XorCsrfTokenRequestAttributeHandler;
import org.springframework.security.web.savedrequest.CookieRequestCache;
import org.springframework.security.web.savedrequest.RequestCache;

Expand Down Expand Up @@ -98,7 +100,14 @@ public void init(H http) {
// session (double-submit cookie pattern)
CsrfTokenRepository csrfTokenRepository = CookieCsrfTokenRepository
.withHttpOnlyFalse();

// This XorCsrfTokenRequestAttributeHandler pattern is copied from
// https://docs.spring.io/spring-security/reference/5.8/migration/servlet/exploits.html#_i_am_using_angularjs_or_another_javascript_framework
XorCsrfTokenRequestAttributeHandler delegate = new XorCsrfTokenRequestAttributeHandler();
CsrfTokenRequestHandler requestHandler = delegate::handle;
csrf.csrfTokenRepository(csrfTokenRepository);
csrf.csrfTokenRequestHandler(requestHandler);

http.getSharedObject(
VaadinSavedRequestAwareAuthenticationSuccessHandler.class)
.setCsrfTokenRepository(csrfTokenRepository);
Expand Down