fix: Fix UserACL API usage - MEED-7574 - Meeds-io/MIPs#151 (#63)

This change will adapt the usage of UserACL Service Layer API to explicitly use ConversationState.getCurrent() instead of using it implicitly.
exoplatform · Oct 7, 2024 · 8f56972 · 8f56972
1 parent 345d371
commit 8f56972
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 30 deletions.
diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/utils/DlpUtils.java b/dlp-services/src/main/java/org/exoplatform/dlp/utils/DlpUtils.java
@@ -6,6 +6,8 @@
 import org.exoplatform.dlp.connector.DlpServiceConnector;
 import org.exoplatform.dlp.processor.DlpOperationProcessor;
 import org.exoplatform.portal.config.UserACL;
+import org.exoplatform.services.security.ConversationState;
+import org.exoplatform.services.security.Identity;
 
 public class DlpUtils {
 
@@ -70,6 +72,11 @@ public static String getDlpRestoredUrl(String reference) {
 
   public static boolean isDlpAdmin() {
     UserACL userACL = CommonsUtils.getService(UserACL.class);
-    return userACL.isSuperUser() || userACL.isUserInGroup(DLP_GROUP);
+    return userACL.isSuperUser(getCurrentIdentity()) || userACL.isUserInGroup(getCurrentIdentity(), DLP_GROUP);
+  }
+
+  private static Identity getCurrentIdentity() {
+    ConversationState conversationState = ConversationState.getCurrent();
+    return conversationState == null ? null : conversationState.getIdentity();
   }
 }
diff --git a/dlp-services/src/test/java/org/exoplatform/dlp/rest/DlpItemRestServicesTest.java b/dlp-services/src/test/java/org/exoplatform/dlp/rest/DlpItemRestServicesTest.java
@@ -1,7 +1,9 @@
 package org.exoplatform.dlp.rest;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.times;
@@ -28,6 +30,8 @@
 import org.exoplatform.dlp.utils.DlpUtils;
 import org.exoplatform.portal.config.UserACL;
 
+import lombok.SneakyThrows;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DlpItemRestServicesTest {
 
@@ -49,59 +53,61 @@ public class DlpItemRestServicesTest {
   private static final String    DLP_GROUP = "/platform/dlp";
 
   @AfterClass
-  public static void afterRunBare() throws Exception { // NOSONAR
+  public static void afterRunBare() {
     DLP_UTILS.close();
     COMMONS_UTILS.close();
   }
 
   @Before
   public void setUp() {
     this.dlpItemRestServices = new DlpItemRestServices(dlpPositiveItemService, dlpOperationProcessor);
+    COMMONS_UTILS.reset();
+    DLP_UTILS.reset();
 
     COMMONS_UTILS.when(() -> CommonsUtils.getService(UserACL.class)).thenReturn(userACL);
-    when(userACL.isUserInGroup(DLP_GROUP)).thenReturn(true);
+    when(userACL.isUserInGroup(any(), eq(DLP_GROUP))).thenReturn(true);
   }
 
   @Test
-  public void getDlpPositiveItems() throws Exception {
+  @SneakyThrows
+  public void getDlpPositiveItems() {
     List<DlpPositiveItem> dlpPositiveItems = new ArrayList<>();
     DlpPositiveItem dlpPositiveItem = new DlpPositiveItem();
     dlpPositiveItem.setId(1L);
     dlpPositiveItem.setKeywords("test");
     dlpPositiveItem.setTitle("title");
     dlpPositiveItems.add(dlpPositiveItem);
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpItemRestServices.getDlpPositiveItems(0, 10);
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenCallRealMethod();
     when(dlpPositiveItemService.getDlpPositivesItems(anyInt(), anyInt())).thenReturn(dlpPositiveItems);
     when(dlpPositiveItemService.getDlpPositiveItemsCount()).thenReturn((long) dlpPositiveItems.size());
     Response response1 = dlpItemRestServices.getDlpPositiveItems(0, 10);
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
     doThrow(new RuntimeException()).when(dlpPositiveItemService).getDlpPositivesItems(anyInt(), anyInt());
     Response response2 = dlpItemRestServices.getDlpPositiveItems(0, 10);
     assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response2.getStatus());
-
   }
 
   @Test
-  public void deleteDlpDocumentById() throws Exception {
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+  public void deleteDlpDocumentById() {
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpItemRestServices.deleteDlpDocumentById(1L);
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenCallRealMethod();
     Response response1 = dlpItemRestServices.deleteDlpDocumentById(1L);
     verify(dlpPositiveItemService, times(1)).deleteDlpPositiveItem(1L);
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
   }
 
   @Test
-  public void getDlpKeywords() throws Exception {
+  public void getDlpKeywords() {
     String keywords = "test, anything";
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpItemRestServices.getDlpKeywords();
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenCallRealMethod();
     when(dlpOperationProcessor.getKeywords()).thenReturn(keywords);
     Response response1 = dlpItemRestServices.getDlpKeywords();
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
@@ -111,31 +117,32 @@ public void getDlpKeywords() throws Exception {
   }
 
   @Test
-  public void setDlpKeywords() throws Exception {
+  public void setDlpKeywords() {
     String keywords = "test, anything";
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpItemRestServices.setDlpKeywords(keywords);
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenCallRealMethod();
     Response response1 = dlpItemRestServices.setDlpKeywords(keywords);
-    verify(dlpOperationProcessor, times(1)).setKeywords(keywords);;
+    verify(dlpOperationProcessor, times(1)).setKeywords(keywords);
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
     doThrow(new RuntimeException()).when(dlpOperationProcessor).setKeywords(keywords);
     Response response2 = dlpItemRestServices.setDlpKeywords(keywords);
     assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response2.getStatus());
   }
 
   @Test
-  public void restoreDlpPositiveItems() throws Exception {
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+  public void restoreDlpPositiveItems() {
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpItemRestServices.restoreDlpPositiveItems(1L);
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenCallRealMethod();
     Response response1 = dlpItemRestServices.restoreDlpPositiveItems(1L);
-    verify(dlpPositiveItemService, times(1)).restoreDlpPositiveItem(1L);;
+    verify(dlpPositiveItemService, times(1)).restoreDlpPositiveItem(1L);
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
     doThrow(new RuntimeException()).when(dlpPositiveItemService).restoreDlpPositiveItem(1L);
     Response response2 = dlpItemRestServices.restoreDlpPositiveItems(1L);
     assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response2.getStatus());
   }
+
 }
diff --git a/dlp-services/src/test/java/org/exoplatform/dlp/rest/DlpRestServicesTest.java b/dlp-services/src/test/java/org/exoplatform/dlp/rest/DlpRestServicesTest.java
@@ -19,7 +19,6 @@
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DlpRestServicesTest {
@@ -33,10 +32,8 @@ public class DlpRestServicesTest {
   @Mock
   private UserACL             userACL;
 
-  private static final String DLP_GROUP = "/platform/dlp";
-
   @AfterClass
-  public static void afterRunBare() throws Exception { // NOSONAR
+  public static void afterRunBare() {
     DLP_UTILS.close();
     COMMONS_UTILS.close();
   }
@@ -46,20 +43,19 @@ public void setUp() {
     dlpRestServices = new DlpRestServices();
 
     COMMONS_UTILS.when(() -> CommonsUtils.getService(UserACL.class)).thenReturn(userACL);
-    when(userACL.isUserInGroup(DLP_GROUP)).thenReturn(true);
   }
 
   @Test
-  public void changeFeatureActivation() throws Exception {
+  public void changeFeatureActivation() {
     ExoFeatureService exoFeatureService = mock(ExoFeatureService.class);
     COMMONS_UTILS.when(() -> CommonsUtils.getService(ExoFeatureService.class)).thenReturn(exoFeatureService);
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenReturn(false);
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(false);
     Response response = dlpRestServices.changeFeatureActivation("false");
     assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
-    DLP_UTILS.when(() -> DlpUtils.isDlpAdmin()).thenCallRealMethod();
+    DLP_UTILS.when(DlpUtils::isDlpAdmin).thenReturn(true);
     Response response1 = dlpRestServices.changeFeatureActivation("true");
-    verify(exoFeatureService, times(1)).saveActiveFeature("dlp", true);
     assertEquals(Response.Status.OK.getStatusCode(), response1.getStatus());
+    verify(exoFeatureService, times(1)).saveActiveFeature("dlp", true);
     doThrow(new RuntimeException()).when(exoFeatureService).saveActiveFeature("dlp", true);
     Response response2 = dlpRestServices.changeFeatureActivation("true");
     assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response2.getStatus());