Merge pull request DSpace#9451 from tdonohue/fix_csrf_issues

Ensure CSRF token doesn't grow on each UI reload
4Science · Apr 5, 2024 · 07e0b02 · 07e0b02
2 parents 96d1385 + 5a1c3c8
commit 07e0b02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 67 deletions.
diff --git a/...rver-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRequestHandler.java b/...rver-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRequestHandler.java
diff --git a/...ce-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java b/...ce-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
@@ -29,6 +29,7 @@
 import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
+import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 /**
@@ -112,7 +113,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
             .csrf((csrf) -> csrf
                 .csrfTokenRepository(this.csrfTokenRepository())
                 .sessionAuthenticationStrategy(this.dSpaceCsrfAuthenticationStrategy())
-                .csrfTokenRequestHandler(new DSpaceCsrfTokenRequestHandler()))
+                // Disable SpringSecurity BREACH protection, as this is not working well with Cookie-based storage.
+                // When enabled, BREACH protection causes the CSRF token to grow in size until UI errors occur.
+                // See https://github.com/DSpace/DSpace/issues/9450
+                // NOTE: DSpace doesn't need BREACH protection as it's only necessary when sending the token via a
+                // request attribute (e.g. "_csrf") which the DSpace UI never does.
+                .csrfTokenRequestHandler(new CsrfTokenRequestAttributeHandler()))
             .exceptionHandling((exceptionHandling) -> exceptionHandling
                 // Return 401 on authorization failures with a correct WWWW-Authenticate header
                 .authenticationEntryPoint(new DSpace401AuthenticationEntryPoint(restAuthenticationService))