Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-4568CreateElecWithRelativePath

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/UpdateRecordsTests.java

@@ -29,8 +29,8 @@ package org.alfresco.rest.rm.community.fileplancomponents;
 import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.IMAGE_FILE;
 import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createElectronicRecordModel;
 import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createNonElectronicRecordModel;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.FORBIDDEN;
 import static org.springframework.http.HttpStatus.OK;
 import static org.testng.Assert.assertEquals;
 
@@ -62,10 +62,10 @@ public class UpdateRecordsTests extends BaseRMRestTest
 {
     @Autowired
     private RMUserAPI rmUserAPI;
-    
+
     /* to be used to append to modifications */
     private final String MODIFIED_PREFIX = "modified_";
-    
+
     /**
      * <pre>
      * Given an incomplete record
@@ -83,14 +83,14 @@ public class UpdateRecordsTests extends BaseRMRestTest
     public void incompleteRecordsCanBeUpdated(FilePlanComponent recordFolder) throws Exception
     {
         FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI();
-        
+
         // create electronic and non-electronic records in a folder
         FilePlanComponent electronicRecord = filePlanComponentsAPI.createElectronicRecord(createElectronicRecordModel(), IMAGE_FILE, recordFolder.getId());
         assertStatusCode(CREATED);
         FilePlanComponent nonElectronicRecord = filePlanComponentsAPI.createFilePlanComponent(createNonElectronicRecordModel(), recordFolder.getId());
         assertStatusCode(CREATED);
-        
+
-        for (FilePlanComponent record: Arrays.asList(electronicRecord, nonElectronicRecord)) {            
+        for (FilePlanComponent record: Arrays.asList(electronicRecord, nonElectronicRecord)) {
             // generate update metadata
             String newName = getModifiedPropertyValue(record.getName());
             String newTitle = getModifiedPropertyValue(record.getProperties().getTitle());
@@ -115,7 +115,7 @@ public class UpdateRecordsTests extends BaseRMRestTest
             assertEquals(updatedRecord.getProperties().getDescription(), newDescription);
         }
     }
-    
+
     /**
      * <pre>
      * Given an incomplete record
@@ -131,7 +131,7 @@ public class UpdateRecordsTests extends BaseRMRestTest
     )
     @AlfrescoTest(jira="RM-4362")
     public void userWithEditMetadataCapsCanUpdateMetadata() throws Exception
-    {   
+    {
         // create test user and add it with collab. privileges
         UserModel updateUser = getDataUser().createRandomTestUser("updateuser");
         updateUser.setUserRole(UserRole.SiteCollaborator);
@@ -151,21 +151,21 @@ public class UpdateRecordsTests extends BaseRMRestTest
         rmUserAPI.addUserPermission(filePlanComponentsAPIAsAdmin.getFilePlanComponent(randomFolder.getParentId()),
             updateUser, UserPermissions.PERMISSION_FILING);
         rmUserAPI.usingRestWrapper().assertStatusCodeIs(OK);
-        
+
         // create electronic and non-electronic records in a folder
         FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI();
         FilePlanComponent electronicRecord = filePlanComponentsAPI.createElectronicRecord(createElectronicRecordModel(), IMAGE_FILE, randomFolder.getId());
         assertStatusCode(CREATED);
         FilePlanComponent nonElectronicRecord = filePlanComponentsAPI.createFilePlanComponent(createNonElectronicRecordModel(), randomFolder.getId());
         assertStatusCode(CREATED);
-        
+
         // get FilePlanComponentAPI instance initialised to updateUser
         FilePlanComponentAPI filePlanComponentsAPIAsUser = getRestAPIFactory().getFilePlanComponentsAPI(updateUser);
-        
+
         for (FilePlanComponent record: Arrays.asList(electronicRecord, nonElectronicRecord)) {
             filePlanComponentsAPIAsUser.getFilePlanComponent(record.getId());
             assertStatusCode(OK);
-            
+
             // generate update metadata
             String newName = getModifiedPropertyValue(record.getName());
             String newTitle = getModifiedPropertyValue(record.getProperties().getTitle());
@@ -191,7 +191,7 @@ public class UpdateRecordsTests extends BaseRMRestTest
             assertEquals(updatedRecord.getModifiedByUser().getId(), updateUser.getUsername());
         }
     }
-    
+
     /**
      * <pre>
      * Given a complete record
@@ -210,16 +210,16 @@ public class UpdateRecordsTests extends BaseRMRestTest
     public void completeRecordsCantBeUpdated(FilePlanComponent recordFolder) throws Exception
     {
         FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI();
-        
+
         // create electronic and non-electronic records in a folder
         FilePlanComponent electronicRecord = filePlanComponentsAPI.createElectronicRecord(createElectronicRecordModel(), IMAGE_FILE, recordFolder.getId());
         assertStatusCode(CREATED);
         closeRecord(electronicRecord);
-       
+
         FilePlanComponent nonElectronicRecord = filePlanComponentsAPI.createFilePlanComponent(createNonElectronicRecordModel(), recordFolder.getId());
         assertStatusCode(CREATED);
         closeRecord(nonElectronicRecord);
-        
+
         for (FilePlanComponent record: Arrays.asList(electronicRecord, nonElectronicRecord)) {
             // generate update metadata
             String newName = getModifiedPropertyValue(record.getName());
@@ -236,7 +236,7 @@ public class UpdateRecordsTests extends BaseRMRestTest
 
             // attempt to update record
             filePlanComponentsAPI.updateFilePlanComponent(updateRecord, record.getId());
-            assertStatusCode(BAD_REQUEST);
+            assertStatusCode(FORBIDDEN);
 
             // verify the original record metatada has been retained
             FilePlanComponent updatedRecord = filePlanComponentsAPI.getFilePlanComponent(record.getId());
@@ -245,7 +245,7 @@ public class UpdateRecordsTests extends BaseRMRestTest
             assertEquals(updatedRecord.getProperties().getDescription(), record.getProperties().getTitle());
         }
     }
-    
+
     /**
      * Helper method to generate modified property value based on original value
      * @param originalValue original value

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml

@@ -78,6 +78,7 @@
    <bean id="recordsManagementPermissionPostProcessor" class="org.alfresco.module.org_alfresco_module_rm.permission.RecordsManagementPermissionPostProcessor" parent="parentPermissionPostProcessor">
       <property name="nodeService" ref="nodeService"/>
       <property name="permissionService" ref="permissionService"/>
+      <property name="permissionModel" ref="permissionsModelDAO"/>
    </bean>
 
    <!-- Import RM model -->

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -1,7 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<beans xmlns="http://www.springframework.org/schema/beans"
-
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-<beans>
+   xmlns:aop="http://www.springframework.org/schema/aop"
+   xmlns:context="http://www.springframework.org/schema/context"
+   xmlns:util="http://www.springframework.org/schema/util"
+   xsi:schemaLocation="
+      http://www.springframework.org/schema/context
+      http://www.springframework.org/schema/context/spring-context-3.0.xsd
+      http://www.springframework.org/schema/beans
+      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+      http://www.springframework.org/schema/aop
+      http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+      http://www.springframework.org/schema/util
+      http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
    <!--  Helper beans -->
 
@@ -569,9 +580,9 @@
           parent="baseService">
         <property name="nodeService" ref="nodeService"/>
         <property name="filePlanService" ref="filePlanService" />
-        <property name="filePlanRoleService" ref="filePlanRoleService" />        
+        <property name="filePlanRoleService" ref="filePlanRoleService" />
-        <property name="authorityService" ref="authorityService"/>        
+        <property name="authorityService" ref="authorityService"/>
-        <property name="permissionService" ref="permissionService"/>   
+        <property name="permissionService" ref="permissionService"/>
         <property name="transactionService" ref="transactionService"/>
     </bean>
 
@@ -1060,8 +1071,21 @@
         <property name="renditionService" ref="RenditionService" />
         <property name="dispositionService" ref="DispositionService"/>
         <property name="recordableVersionService" ref="RecordableVersionService"/>
+        <property name="alwaysEditURIs" ref="recordService_alwaysEditURIs" />
     </bean>
 
+   <!-- Defines a list of namespace URIs for properties, which should be always editable -->
+   <util:list id="recordService_alwaysEditURIs" value-type="java.lang.String">
+      <value>http://www.alfresco.org/model/security/1.0</value>
+      <value>http://www.alfresco.org/model/system/1.0</value>
+      <value>http://www.alfresco.org/model/workflow/1.0</value>
+      <value>http://www.alfresco.org/model/application/1.0</value>
+      <value>http://www.alfresco.org/model/datalist/1.0</value>
+      <value>http://www.alfresco.org/model/dictionary/1.0</value>
+      <value>http://www.alfresco.org/model/bpm/1.0</value>
+      <value>http://www.alfresco.org/model/rendition/1.0</value>
+   </util:list>
+
     <bean id="recordMetadataAspectBootstrap" class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init" abstract="true">
     	<property name="recordService" ref="recordService"/>
     	<property name="namespaceService" ref="namespaceService"/>

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/permission/RecordsManagementPermissionPostProcessor.java

@@ -31,6 +31,8 @@ import java.util.List;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.repo.security.permissions.PermissionReference;
+import org.alfresco.repo.security.permissions.impl.model.PermissionModel;
 import org.alfresco.repo.security.permissions.processor.impl.PermissionPostProcessorBaseImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -39,47 +41,81 @@ import org.alfresco.service.cmr.security.PermissionService;
 
 /**
  * Records management permission post processor.
- * 
+ *
  * @author Roy Wetherall
  * @since 2.4.a
  */
-public class RecordsManagementPermissionPostProcessor extends PermissionPostProcessorBaseImpl 
+public class RecordsManagementPermissionPostProcessor extends PermissionPostProcessorBaseImpl
 {
-	/** node service */
+    /** node service */
-	private NodeService nodeService;
+    private NodeService nodeService;
-	public void setNodeService(NodeService nodeService) {this.nodeService=nodeService;}
+    public void setNodeService(NodeService nodeService) {this.nodeService=nodeService;}
-	
+
-	/** permission service */
+    /** permission service */
-	private PermissionService permissionService;
+    private PermissionService permissionService;
-	public void setPermissionService(PermissionService permissionService) {this.permissionService=permissionService;}
+    public void setPermissionService(PermissionService permissionService) {this.permissionService=permissionService;}
-	
+
-	/**
+    /** The permission model DAO. */
-	 * @see org.alfresco.repo.security.permissions.processor.PermissionPostProcessor#process(org.alfresco.service.cmr.security.AccessStatus, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
+    private PermissionModel permissionModel;
-	 */
+    public void setPermissionModel(PermissionModel permissionModel) {this.permissionModel=permissionModel;}
-	@Override
+
-	public AccessStatus process(AccessStatus accessStatus, NodeRef nodeRef, String perm,
+    /**
-								List configuredReadPermissions, List configuredFilePermissions)
+     * @see org.alfresco.repo.security.permissions.processor.PermissionPostProcessor#process(org.alfresco.service.cmr.security.AccessStatus, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
-	{
+     */
-		AccessStatus result = accessStatus;
+    @Override
-		if (AccessStatus.DENIED.equals(accessStatus) &&
+    public AccessStatus process(AccessStatus accessStatus, NodeRef nodeRef, String perm,
+                                List<String> configuredReadPermissions, List<String> configuredFilePermissions)
+    {
+        AccessStatus result = accessStatus;
+        if (AccessStatus.DENIED.equals(accessStatus) &&
             nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
-		{        
+        {
-			// if read denied on rm artifact
+            // if read denied on rm artifact
-	        if (PermissionService.READ.equals(perm) || configuredReadPermissions.contains(perm))
+            if (PermissionService.READ.equals(perm) || isPermissionContained(perm, configuredReadPermissions))
-	        {
+            {
-	        	// check for read record
+                // check for read record
-	            result = permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
+                result = permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
-	        }
+            }
-	        // if write deinied on rm artificat
+            // if write denied on rm artifact
-	        else if (PermissionService.WRITE.equals(perm) || configuredFilePermissions.contains(perm))
+            else if (PermissionService.WRITE.equals(perm) || isPermissionContained(perm, configuredFilePermissions))
-	        {
+            {
-	        	// check for file record
+                // check for file record
-	        	result = permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);
+                result = permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);
-	        }
+            }
-		}
+        }
-		
+
-		return result;
+        return result;
-	
+
-	}
+    }
+
+    /**
+     * Check if a given permission is implied by a list of permission groups.
+     *
+     * @param perm The name of the permission in question.
+     * @param configuredPermissions The list of permission group names.
+     * @return true if the permission is contained or implied by the list of permissions.
+     */
+    private boolean isPermissionContained(String perm, List<String> configuredPermissions)
+    {
+        // Check if the permission is explicitly in the list
+        if (configuredPermissions.contains(perm))
+        {
+            return true;
+        }
+        // Check if the permission is implied by one from the list.
+        for (String configuredPermission : configuredPermissions)
+        {
+            // TODO: Here we are assuming the permission name is unique across all contexts (but I think we're doing that in the properties file anyway).
+            PermissionReference permissionReference = permissionModel.getPermissionReference(null, configuredPermission);
+            for (PermissionReference granteePermission : permissionModel.getGranteePermissions(permissionReference))
+            {
+                if (granteePermission.getName().equals(perm))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
 }

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java

@@ -27,8 +27,6 @@
 
 package org.alfresco.module.org_alfresco_module_rm.record;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -158,18 +156,22 @@ public class RecordServiceImpl extends BaseBehaviourBean
     };
 
     /** always edit model URI's */
+    private List<String> alwaysEditURIs;
+
+    /**
+     * @param alwaysEditURIs the alwaysEditURIs to set
+     */
+    public void setAlwaysEditURIs(List<String> alwaysEditURIs)
+    {
+        this.alwaysEditURIs = alwaysEditURIs;
+    }
+
+    /**
+     * @return the alwaysEditURIs
+     */
     protected List<String> getAlwaysEditURIs()
     {
-        return newArrayList(
+        return this.alwaysEditURIs;
-            NamespaceService.SECURITY_MODEL_1_0_URI,
-            NamespaceService.SYSTEM_MODEL_1_0_URI,
-            NamespaceService.WORKFLOW_MODEL_1_0_URI,
-            NamespaceService.APP_MODEL_1_0_URI,
-            NamespaceService.DATALIST_MODEL_1_0_URI,
-            NamespaceService.DICTIONARY_MODEL_1_0_URI,
-            NamespaceService.BPM_MODEL_1_0_URI,
-            NamespaceService.RENDITION_MODEL_1_0_URI
-        );
     }
 
     /** record model URI's */

rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/processor/PermissionPostProcessor.java

@@ -52,5 +52,5 @@ public interface PermissionPostProcessor
 	 * @return {@link AccessStatus}
 	 */
 	AccessStatus process(AccessStatus accessStatus, NodeRef nodeRef, String perm,
-						List configuredReadPermissions, List configuredFilePermissions);
+						List<String> configuredReadPermissions, List<String> configuredFilePermissions);
 }

rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/permission/RecordsManagementPermissionPostProcessorUnitTest.java

@@ -28,8 +28,8 @@
 package org.alfresco.module.org_alfresco_module_rm.permission;
 
 import static java.util.Arrays.asList;
-
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
@@ -37,6 +37,8 @@ import java.util.List;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock;
+import org.alfresco.repo.security.permissions.PermissionReference;
+import org.alfresco.repo.security.permissions.impl.model.PermissionModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -47,20 +49,26 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import com.google.common.collect.Sets;
+
 /**
  * Unit tests for {@link RecordsManagementPermissionPostProcessor}.
  *
  * @author David Webster
+ * @author Tom Page
  * @since 2.4.1
  */
 public class RecordsManagementPermissionPostProcessorUnitTest
 {
+    @InjectMocks
+    private RecordsManagementPermissionPostProcessor recordsManagementPermissionPostProcessor = new RecordsManagementPermissionPostProcessor();
 
-    private @InjectMocks
+    @Mock
-    RecordsManagementPermissionPostProcessor recordsManagementPermissionPostProcessor = new RecordsManagementPermissionPostProcessor();
+    private NodeService mockNodeService;
-
+    @Mock
-    private @Mock NodeService nodeService;
+    private PermissionService mockPermissionService;
-    private @Mock PermissionService permissionService;
+    @Mock
+    private PermissionModel mockPermissionModel;
 
     @Before
     public void setup()
@@ -83,9 +91,9 @@ public class RecordsManagementPermissionPostProcessorUnitTest
         List<String> configuredReadPermissions = asList("ReadProperties", "ReadChildren", perm);
         List<String> configuredFilePermissions = asList("WriteProperties", "AddChildren");
 
-        when(nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
+        when(mockNodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
             .thenReturn(true);
-        when(permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS))
+        when(mockPermissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS))
             .thenReturn(AccessStatus.ALLOWED);
 
         AccessStatus result = recordsManagementPermissionPostProcessor.process(accessStatus, nodeRef, perm, configuredReadPermissions, configuredFilePermissions);
@@ -108,13 +116,51 @@ public class RecordsManagementPermissionPostProcessorUnitTest
         List<String> configuredReadPermissions = asList("ReadProperties", "ReadChildren");
         List<String> configuredFilePermissions = asList("WriteProperties", "AddChildren");
 
-        when(nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
+        when(mockNodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
             .thenReturn(true);
-        when(permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS))
+        when(mockPermissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS))
             .thenReturn(AccessStatus.ALLOWED);
 
         AccessStatus result = recordsManagementPermissionPostProcessor.process(accessStatus, nodeRef, perm, configuredReadPermissions, configuredFilePermissions);
 
         assertEquals(AccessStatus.DENIED, result);
     }
+
+    /**
+     * Test that the permission groups configured in the global properties file imply descendant permission groups.
+     * <p>
+     * Given a configured permission is an ancestor of another permission P
+     * And the post processor checks if the user has P
+     * Then the post processor says that they do.
+     */
+    @Test
+    public void permissionInherittedFromConfiguredGroup()
+    {
+        NodeRef nodeRef = new NodeRef("node://ref/");
+        // permissions do not include perm created above
+        List<String> configuredReadPermissions = asList();
+        List<String> configuredFilePermissions = asList("WriteProperties");
+
+        when(mockNodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
+            .thenReturn(true);
+        when(mockPermissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS))
+            .thenReturn(AccessStatus.ALLOWED);
+
+        // Set up "WriteProperties" to imply three other permission groups.
+        PermissionReference mockWritePropsPermRef = mock(PermissionReference.class);
+        when(mockPermissionModel.getPermissionReference(null, "WriteProperties")).thenReturn(mockWritePropsPermRef);
+        PermissionReference childOne = mock(PermissionReference.class);
+        when(childOne.getName()).thenReturn("Not this one");
+        PermissionReference childTwo = mock(PermissionReference.class);
+        when(childTwo.getName()).thenReturn("This is the requested permission");
+        PermissionReference childThree = mock(PermissionReference.class);
+        when(childThree.getName()).thenReturn("Not this one either");
+        when(mockPermissionModel.getGranteePermissions(mockWritePropsPermRef)).thenReturn(Sets.newHashSet(childOne, childTwo, childThree));
+
+        // Call the method under test.
+        AccessStatus result = recordsManagementPermissionPostProcessor.process(AccessStatus.DENIED, nodeRef,
+                    "This is the requested permission", configuredReadPermissions, configuredFilePermissions);
+
+        assertEquals(AccessStatus.ALLOWED, result);
+    }
 }