fix: do not logout the user if XSRF token is used in async operation

Refs: #170
SchweizerischeBundesbahnen · Sep 2, 2024 · e3935fd · e3935fd
1 parent 77a76d4
commit e3935fd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.sbb.polarion.extensions</groupId>
         <artifactId>ch.sbb.polarion.extension.generic</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
     </parent>
 
     <artifactId>ch.sbb.polarion.extension.pdf-exporter</artifactId>

diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverterJobsService.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverterJobsService.java
@@ -156,7 +156,12 @@ public record JobState(
 
     private boolean isJobLogoutRequired() {
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        return (requestAttributes != null) &&
-                (requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST) == Boolean.TRUE);
+        if (requestAttributes != null) {
+            if (requestAttributes.getAttribute(LogoutFilter.XSRF_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST) == Boolean.TRUE) {
+                return false;
+            }
+            return requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST) == Boolean.TRUE;
+        }
+        return false;
     }
 }
diff --git a/...st/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverterJobsServiceTest.java b/...st/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverterJobsServiceTest.java
@@ -62,6 +62,7 @@ public void tearDown() {
     @Test
     void shouldStartJobAndGetStatus() {
         prepareSecurityServiceSubject(subject);
+        when(requestAttributes.getAttribute(LogoutFilter.XSRF_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(Boolean.FALSE);
         when(requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(Boolean.TRUE);
         ExportParams exportParams = ExportParams.builder().build();
         when(pdfConverter.convertToPdf(exportParams, null)).thenReturn("test pdf".getBytes());
@@ -86,6 +87,7 @@ void shouldStartJobAndGetStatus() {
     @Test
     void shouldReturnFailInExceptionalCase() {
         prepareSecurityServiceSubject(subject);
+        when(requestAttributes.getAttribute(LogoutFilter.XSRF_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(Boolean.FALSE);
         when(requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(Boolean.TRUE);
         ExportParams exportParams = ExportParams.builder().build();
         when(pdfConverter.convertToPdf(exportParams, null)).thenThrow(new RuntimeException("test error"));
@@ -131,11 +133,16 @@ void shouldAcceptNullSubject() {
         verify(securityService, never()).logout(null);
     }
 
-    @Test
-    void shouldNotLogoutWithoutLogoutProperty() {
+    @ParameterizedTest
+    @CsvSource({
+            "true,true",
+            "true,false",
+            "false,false"
+    })
+    void shouldNotLogoutWithoutAsyncSkipLogoutProperty(boolean xsrfSkipLogout, boolean asyncSkipLogout) {
         prepareSecurityServiceSubject(subject);
-        when(requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(null);
-
+        lenient().when(requestAttributes.getAttribute(LogoutFilter.XSRF_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(xsrfSkipLogout);
+        lenient().when(requestAttributes.getAttribute(LogoutFilter.ASYNC_SKIP_LOGOUT, RequestAttributes.SCOPE_REQUEST)).thenReturn(asyncSkipLogout);
 
         ExportParams exportParams = ExportParams.builder().build();
         when(pdfConverter.convertToPdf(exportParams, null)).thenReturn("test pdf".getBytes());
@@ -147,7 +154,7 @@ void shouldNotLogoutWithoutLogoutProperty() {
         JobState jobState = pdfConverterJobsService.getJobState(jobId);
         assertThat(jobState.isCompletedExceptionally()).isFalse();
         assertThat(jobState.isCancelled()).isFalse();
-        verify(securityService, never()).logout(null);
+        verify(securityService, never()).logout(subject);
     }
 
     @ParameterizedTest