hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

103818 ItemServiceImpl#inheritCollectionDefaultPolicies now clears item READ policies if new parent collection has a default READ policy

Browse Source
This commit is contained in:
Koen Pauwels
2023-08-04 11:39:35 +02:00
parent 5a43e6bcf1
commit 54280e8fe2
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -920,6 +920,14 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
@Override
public void inheritCollectionDefaultPolicies(Context context, Item item, Collection collection)
throws SQLException, AuthorizeException {
// If collection has READ policies, remove the item's READ policies.
List<ResourcePolicy> defaultCollectionPolicies = authorizeService
.getPoliciesActionFilter(context, collection, Constants.DEFAULT_ITEM_READ);
if (!defaultCollectionPolicies.isEmpty()) {
authorizeService.removePoliciesActionFilter(context, item, Constants.READ);
}
adjustItemPolicies(context, item, collection);
adjustBundleBitstreamPolicies(context, item, collection);

54
dspace-api/src/test/java/org/dspace/content/service/ItemServiceTest.java
View File

@@ -26,6 +26,8 @@ import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.requestitem.RequestItem;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.builder.BitstreamBuilder;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
@@ -48,6 +50,8 @@ import org.dspace.content.WorkspaceItem;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.core.Constants;
import org.dspace.eperson.Group;
import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.eperson.service.GroupService;
import org.dspace.versioning.Version;
import org.dspace.versioning.factory.VersionServiceFactory;
import org.dspace.versioning.service.VersioningService;
@@ -68,6 +72,8 @@ public class ItemServiceTest extends AbstractIntegrationTestWithDatabase {
protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
protected MetadataValueService metadataValueService = ContentServiceFactory.getInstance().getMetadataValueService();
protected VersioningService versioningService = VersionServiceFactory.getInstance().getVersionService();
protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
Community community;
Collection collection1;
@@ -752,6 +758,54 @@ public class ItemServiceTest extends AbstractIntegrationTestWithDatabase {
assertNull(itemService.find(context, item.getID()));
}
@Test
public void testMoveItemToCollectionWithMoreRestrictiveReadPolicy() throws Exception {
/* Verify that, if we move an item from a collection with a permissive default READ policy
* to a collection with a restrictive default READ policy,
* that the item does not retain the original permissive READ policy.
*/
context.turnOffAuthorisationSystem();
Group anonymous = groupService.findByName(context, Group.ANONYMOUS);
Group admin = groupService.findByName(context, Group.ADMIN);
// Set up the two different collections: one permissive and one restrictive in its default READ policy.
Collection permissive = CollectionBuilder
.createCollection(context, community)
.build();
Collection restrictive = CollectionBuilder
.createCollection(context, community)
.build();
authorizeService.removePoliciesActionFilter(context, restrictive, Constants.DEFAULT_ITEM_READ);
authorizeService.addPolicy(context, restrictive, Constants.DEFAULT_ITEM_READ, admin);
// Add an item to the permissive collection.
Item item = ItemBuilder
.createItem(context, permissive)
.build();
// Verify that the item has exactly one READ policy, for the anonymous group.
assertEquals(
List.of(anonymous),
authorizeService.getPoliciesActionFilter(context, item, Constants.READ)
.stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
);
// Move the item to the restrictive collection, making sure to inherit default policies.
itemService.move(context, item, permissive, restrictive, true);
// Verify that the item has exactly one READ policy, but now for the admin group.
assertEquals(
List.of(admin),
authorizeService.getPoliciesActionFilter(context, item, Constants.READ)
.stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
);
context.restoreAuthSystemState();
}
private void assertMetadataValue(String authorQualifier, String contributorElement, String dcSchema, String value,
String authority, int place, MetadataValue metadataValue) {
assertThat(metadataValue.getValue(), equalTo(value));