Skip to content

Commit

Permalink
Issue #3029: Optionally exclude archived files from GUI S3 storage li…
Browse files Browse the repository at this point in the history 
…sting - fix for tags browsing (#3097)
  • Loading branch information
@ekazachkova
ekazachkova authored Feb 28, 2023
1 parent 0f623f8 commit b0831d5
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 35 deletions.
17 changes: 11 additions & 6 deletions api/src/main/java/com/epam/pipeline/acl/datastorage/DataStorageApiService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,19 @@ public Map<String, String> deleteDataStorageObjectTags(Long id, String path, Str
return dataStorageManager.deleteDataStorageObjectTags(id, path, version, tags);
}

@PreAuthorize(AclExpressions.STORAGE_ID_READ)
public AbstractDataStorageItem getDataStorageItemWithTags(Long id, String path, Boolean showVersion) {
return dataStorageManager.getDataStorageItemWithTags(id, path, showVersion);
@PreAuthorize(AclExpressions.STORAGE_ID_READ + AclExpressions.AND
+ AclExpressions.STORAGE_SHOW_ARCHIVED_PERMISSIONS)
public AbstractDataStorageItem getDataStorageItemWithTags(final Long id, final String path,
final Boolean showVersion, final boolean showArchived) {
return dataStorageManager.getDataStorageItemWithTags(id, path, showVersion, showArchived);
}

@PreAuthorize(AclExpressions.STORAGE_ID_OWNER)
public AbstractDataStorageItem getDataStorageItemOwnerWithTags(Long id, String path, Boolean showVersion) {
return dataStorageManager.getDataStorageItemWithTags(id, path, showVersion);
@PreAuthorize(AclExpressions.STORAGE_ID_OWNER + AclExpressions.AND
+ AclExpressions.STORAGE_SHOW_ARCHIVED_PERMISSIONS)
public AbstractDataStorageItem getDataStorageItemOwnerWithTags(final Long id, final String path,
final Boolean showVersion,
final boolean showArchived) {
return dataStorageManager.getDataStorageItemWithTags(id, path, showVersion, showArchived);
}

@PreAuthorize(AclExpressions.STORAGE_ID_OWNER)
Expand Down
9 changes: 6 additions & 3 deletions api/src/main/java/com/epam/pipeline/controller/datastorage/DataStorageController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,10 +685,13 @@ public Result<Map<String, String>> deleteTagsById(@PathVariable(value = ID) fina
public Result<AbstractDataStorageItem> getDataStorageItemsWithTags(
@PathVariable(value = ID) final Long id,
@RequestParam(value = PATH) final String path,
@RequestParam(defaultValue = FALSE) final Boolean showVersion) {
@RequestParam(defaultValue = FALSE) final Boolean showVersion,
@RequestParam(defaultValue = FALSE) final boolean showArchived) {
return showVersion
? Result.success(dataStorageApiService.getDataStorageItemOwnerWithTags(id, path, showVersion))
: Result.success(dataStorageApiService.getDataStorageItemWithTags(id, path, showVersion));
? Result.success(dataStorageApiService.getDataStorageItemOwnerWithTags(
id, path, showVersion, showArchived))
: Result.success(dataStorageApiService.getDataStorageItemWithTags(
id, path, showVersion, showArchived));
}

@RequestMapping(value = "/datastorage/tags/search", method = RequestMethod.POST)
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/com/epam/pipeline/manager/datastorage/DataStorageManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,10 @@ public Map<String, String> deleteDataStorageObjectTags(Long id, String path, Str
@Transactional
public AbstractDataStorageItem getDataStorageItemWithTags(final Long dataStorageId,
final String path,
final Boolean showVersion) {
final Boolean showVersion,
final boolean showArchived) {
final List<AbstractDataStorageItem> dataStorageItems = getDataStorageItems(dataStorageId, path, showVersion,
null, null, false).getResults();
null, null, showArchived).getResults();
if (CollectionUtils.isEmpty(dataStorageItems)) {
return null;
}
Expand Down
42 changes: 26 additions & 16 deletions api/src/test/java/com/epam/pipeline/acl/datastorage/DataStorageApiServiceFileTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,87 +891,97 @@ public void shouldDenyDeleteObjectTagsWhenSharedPermissionIsNotGranted() {
@Test
@WithMockUser(roles = ADMIN_ROLE)
public void shouldGetItemWithTagsForAdmin() {
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
mockUserContext(context);

assertThat(dataStorageApiService.getDataStorageItemWithTags(ID, TEST_STRING, true))
assertThat(dataStorageApiService.getDataStorageItemWithTags(ID, TEST_STRING, true, false))
.isEqualTo(dataStorageFile);
}

@Test
@WithMockUser(username = SIMPLE_USER)
public void shouldGetItemWithTagsWhenPermissionIsGranted() {
initAclEntity(s3bucket, AclPermission.READ);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(SIMPLE_USER, s3bucket, context);

assertThat(dataStorageApiService.getDataStorageItemWithTags(ID, TEST_STRING, true))
assertThat(dataStorageApiService
.getDataStorageItemWithTags(ID, TEST_STRING, true, false))
.isEqualTo(dataStorageFile);
}

@Test
@WithMockUser
public void shouldDenyGetItemWithTagsWhenStoragePermissionIsNotGranted() {
initAclEntity(s3bucket);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(ANOTHER_SIMPLE_USER, s3bucket, context);

assertThrows(AccessDeniedException.class, () -> dataStorageApiService
.getDataStorageItemWithTags(ID, TEST_STRING, true));
.getDataStorageItemWithTags(ID, TEST_STRING, true, false));
}

@Test
@WithMockUser
public void shouldDenyGetItemWithTagsWhenSharedPermissionIsNotGranted() {
initAclEntity(notSharedS3bucket, AclPermission.READ);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(ANOTHER_SIMPLE_USER, notSharedS3bucket, externalContext);

assertThrows(AccessDeniedException.class, () -> dataStorageApiService
.getDataStorageItemWithTags(ID, TEST_STRING, true));
.getDataStorageItemWithTags(ID, TEST_STRING, true, false));
}

@Test
@WithMockUser(roles = ADMIN_ROLE)
public void shouldGetItemOwnerWithTagsForAdmin() {
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
mockUserContext(context);

assertThat(dataStorageApiService.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true))
assertThat(dataStorageApiService.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true, false))
.isEqualTo(dataStorageFile);
}

@Test
@WithMockUser
public void shouldGetItemOwnerWithTagsWhenPermissionIsGranted() {
initAclEntity(notSharedS3bucket, AclPermission.OWNER);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(SIMPLE_USER, notSharedS3bucket, context);

assertThat(dataStorageApiService.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true))
assertThat(dataStorageApiService
.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true, false))
.isEqualTo(dataStorageFile);
}

@Test
@WithMockUser
public void shouldDenyGetItemOwnerWithTagsWhenStoragePermissionIsNotGranted() {
initAclEntity(s3bucket);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(ANOTHER_SIMPLE_USER, s3bucket, context);

assertThrows(AccessDeniedException.class, () -> dataStorageApiService
.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true));
.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true, false));
}

@Test
@WithMockUser
public void shouldDenyGetItemOwnerWithTagsWhenSharedPermissionIsNotGranted() {
initAclEntity(notSharedS3bucket, AclPermission.OWNER);
doReturn(dataStorageFile).when(mockDataStorageManager).getDataStorageItemWithTags(ID, TEST_STRING, true);
doReturn(dataStorageFile).when(mockDataStorageManager)
.getDataStorageItemWithTags(ID, TEST_STRING, true, false);
initUserAndEntityMocks(ANOTHER_SIMPLE_USER, notSharedS3bucket, externalContext);

assertThrows(AccessDeniedException.class, () -> dataStorageApiService
.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true));
.getDataStorageItemOwnerWithTags(ID, TEST_STRING, true, false));
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions ...src/test/java/com/epam/pipeline/controller/datastorage/DataStorageItemControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,11 @@ public void shouldGetDataStorageFileWithTags() {
final MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add(ID_PARAM, ID_AS_STRING);
params.add(PATH, TEST);
Mockito.doReturn(file).when(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false);
Mockito.doReturn(file).when(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false, false);

final MvcResult mvcResult = performRequest(get(String.format(TAGS_LIST_URL, ID)).params(params));

Mockito.verify(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false);
Mockito.verify(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false, false);
assertResponse(mvcResult, file, DatastorageCreatorUtils.DATA_STORAGE_FILE_TYPE);
}

Expand All @@ -381,11 +381,11 @@ public void shouldGetDataStorageFileOwnerWithTags() {
params.add(ID_PARAM, ID_AS_STRING);
params.add(PATH, TEST);
params.add(SHOW_VERSION, TRUE_AS_STRING);
Mockito.doReturn(file).when(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true);
Mockito.doReturn(file).when(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true, false);

final MvcResult mvcResult = performRequest(get(String.format(TAGS_LIST_URL, ID)).params(params));

Mockito.verify(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true);
Mockito.verify(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true, false);
assertResponse(mvcResult, file, DatastorageCreatorUtils.DATA_STORAGE_FILE_TYPE);
}

Expand All @@ -395,11 +395,11 @@ public void shouldGetDataStorageFolderWithTags() {
final MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add(ID_PARAM, ID_AS_STRING);
params.add(PATH, TEST);
Mockito.doReturn(folder).when(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false);
Mockito.doReturn(folder).when(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false, false);

final MvcResult mvcResult = performRequest(get(String.format(TAGS_LIST_URL, ID)).params(params));

Mockito.verify(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false);
Mockito.verify(mockStorageApiService).getDataStorageItemWithTags(ID, TEST, false, false);
assertResponse(mvcResult, folder, DatastorageCreatorUtils.DATA_STORAGE_FOLDER_TYPE);
}

Expand All @@ -410,11 +410,11 @@ public void shouldGetDataStorageFolderOwnerWithTags() {
params.add(ID_PARAM, ID_AS_STRING);
params.add(PATH, TEST);
params.add(SHOW_VERSION, TRUE_AS_STRING);
Mockito.doReturn(folder).when(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true);
Mockito.doReturn(folder).when(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true, false);

final MvcResult mvcResult = performRequest(get(String.format(TAGS_LIST_URL, ID)).params(params));

Mockito.verify(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true);
Mockito.verify(mockStorageApiService).getDataStorageItemOwnerWithTags(ID, TEST, true, false);
assertResponse(mvcResult, folder, DatastorageCreatorUtils.DATA_STORAGE_FOLDER_TYPE);
}

Expand Down

0 comments on commit b0831d5

Please sign in to comment.