RM-4326: removed checkPostPermission method and changed RmSyteType to

handle allowed created types

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

@@ -86,8 +86,6 @@
 
    <bean id="rma.transfer" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.TransferType" parent="rm.baseBehaviour" />
 
-   <bean id="rma.hold" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.HoldType" parent="rm.baseBehaviour" />
-
    <bean id="rma.unfiledRecordsContainer" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.UnfiledRecordContainerType" parent="rm.baseBehaviour">
    </bean>
 

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

@@ -1499,7 +1499,6 @@
       <property name="recordFolderService" ref="RecordFolderService" />
       <property name="permissionService" ref="PermissionService"/>
       <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-      <property name="holdType" ref="rma.hold" />
    </bean>
 
    <bean id="HoldService"

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java

@@ -44,7 +44,6 @@ import org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
-import org.alfresco.module.org_alfresco_module_rm.model.rma.type.HoldType;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
 import org.alfresco.module.org_alfresco_module_rm.util.ServiceBaseImpl;
@@ -103,8 +102,6 @@ public class HoldServiceImpl extends ServiceBaseImpl
     /** records management audit service */
     private RecordsManagementAuditService recordsManagementAuditService;
 
-    private HoldType holdType;
-
     /**
      * Set the file plan service
      *
@@ -163,11 +160,6 @@ public class HoldServiceImpl extends ServiceBaseImpl
         this.recordsManagementAuditService = recordsManagementAuditService;
     }
 
-    public void setHoldType(HoldType holdType)
-    {
-        this.holdType = holdType;
-    }
-
     /**
      * Initialise hold service
      */
@@ -602,15 +594,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
                         }
 
                         // Link the record to the hold
-                        holdType.disable();
-                        try
-                        {
                         nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS);
-                        }
-                        finally
-                        {
-                            holdType.enable();
-                        }
 
                         // audit item being added to the hold
                         recordsManagementAuditService.auditEvent(nodeRef, AUDIT_ADD_TO_HOLD);

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldType.java

@@ -1,79 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
-
-import java.security.InvalidParameterException;
-
-import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
-import org.alfresco.repo.node.NodeServicePolicies;
-import org.alfresco.repo.policy.annotation.Behaviour;
-import org.alfresco.repo.policy.annotation.BehaviourBean;
-import org.alfresco.repo.policy.annotation.BehaviourKind;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-
-/**
- * rma:transferContainer behaviour bean
- *
- * @author Silviu Dinuta
- * @since 2.6
- */
-@BehaviourBean(defaultType = "rma:hold")
-public class HoldType extends BaseBehaviourBean implements NodeServicePolicies.OnCreateChildAssociationPolicy
-{
-    private static final String BEHAVIOUR_NAME = "onCreateChildAssocsForHoldType";
-
-    /**
-     * Disable the behaviours for this transaction
-     *
-     */
-    public void disable()
-    {
-        getBehaviour(BEHAVIOUR_NAME).disable();
-    }
-
-    /**
-     * Enable behaviours for this transaction
-     *
-     */
-    public void enable()
-    {
-        getBehaviour(BEHAVIOUR_NAME).enable();
-    }
-
-    @Override
-    @Behaviour
-    (
-                kind = BehaviourKind.ASSOCIATION,
-                name = BEHAVIOUR_NAME
-    )
-    public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean isNewNode)
-    {
-        throw new InvalidParameterException("Operation failed. Creation is not allowed in Hold Folders");
-    }
-
-}

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java

@@ -28,10 +28,14 @@
 package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
 
 import java.io.Serializable;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
 import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
@@ -55,6 +59,8 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ParameterCheck;
 import org.alfresco.util.PropertyMap;
 
+import com.google.common.collect.Sets;
+
 /**
  * Behaviour associated with the RM Site type
  *
@@ -68,7 +74,8 @@ import org.alfresco.util.PropertyMap;
 public class RmSiteType extends    BaseBehaviourBean
                         implements NodeServicePolicies.OnCreateNodePolicy,
                                    NodeServicePolicies.OnUpdatePropertiesPolicy,
-                                   NodeServicePolicies.BeforeDeleteNodePolicy
+                                   NodeServicePolicies.BeforeDeleteNodePolicy,
+                                   NodeServicePolicies.OnCreateChildAssociationPolicy
 {
     /** Constant values */
     public static final String COMPONENT_DOCUMENT_LIBRARY = "documentLibrary";
@@ -295,4 +302,44 @@ public class RmSiteType extends    BaseBehaviourBean
             }
         }
     }
+
+    /**
+     * @author Silviu Dinuta
+     * @since 2.6
+     */
+    @Override
+    @Behaviour(kind = BehaviourKind.ASSOCIATION)
+    public void onCreateChildAssociation(final ChildAssociationRef childAssocRef, boolean isNewNode)
+    {
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork()
+            {
+                final NodeRef child = childAssocRef.getChildRef();
+                final NodeRef parent = childAssocRef.getParentRef();
+                List<QName> acceptedUniqueChildTypes = new ArrayList<QName>();
+                SiteInfo siteInfo = siteService.getSite(parent);
+                acceptedUniqueChildTypes.add(getFilePlanType(siteInfo));
+                List<QName> acceptedNonUniqueChildTypes = new ArrayList<QName>();
+                acceptedNonUniqueChildTypes.add(ContentModel.TYPE_FOLDER);
+                // check the created child is of an accepted type
+                validateNewChildAssociation(parent, child, acceptedUniqueChildTypes, acceptedNonUniqueChildTypes);
+                return null;
+            }
+        });
+    }
+
+    @Override
+    protected void validateNewChildAssociation(NodeRef parent, NodeRef child, List<QName> acceptedUniqueChildType,
+                List<QName> acceptedMultipleChildType) throws InvalidParameterException
+    {
+        super.validateNewChildAssociation(parent, child, acceptedUniqueChildType, acceptedMultipleChildType);
+
+        // check the user is not trying to create more than 2 folders that are created by default
+        if(nodeService.getChildAssocs(parent, Sets.newHashSet(ContentModel.TYPE_FOLDER)).size() > 2)
+        {
+            throw new InvalidParameterException("Operation failed. Children of type " + ContentModel.TYPE_FOLDER + " are not allowed");
+        }
+    }
 }

rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/RMNodes.java

@@ -45,11 +45,4 @@ public interface RMNodes extends Nodes
     public static String PARAM_INCLUDE_HAS_RETENTION_SCHEDULE = "hasRetentionSchedule";
     public static String PARAM_INCLUDE_IS_CLOSED = "isClosed";
     public static String PARAM_INCLUDE_IS_COMPLETED = "isCompleted";
-
-    /**
-     * Verifies if the post request is allowed for nodeId received as parameter.
-     *
-     * @param nodeId
-     */
-    void checkPostPermission(String nodeId);
 }

rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java

@@ -59,8 +59,6 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
@@ -86,7 +84,6 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
     private Repository repositoryHelper;
     private DictionaryService dictionaryService;
     private DispositionService dispositionService;
-    private SiteService siteService;
 
     /**
      * TODO to remove this after isSpecialNode is made protected in core implementation(REPO-1459)
@@ -98,7 +95,6 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
         this.nodeService = serviceRegistry.getNodeService();
         this.dictionaryService = serviceRegistry.getDictionaryService();
         this.dispositionService = serviceRegistry.getDispositionService();
-        this.siteService = serviceRegistry.getSiteService();
     }
 
     public void setRecordsManagementServiceRegistry(RecordsManagementServiceRegistry serviceRegistry)
@@ -402,20 +398,4 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
         }
         super.deleteNode(nodeId, parameters);
     }
-
-    @Override
-    public void checkPostPermission(String nodeId)
-    {
-        NodeRef parentNodeRef = validateOrLookupNode(nodeId, null);
-
-        SiteInfo siteInfo = siteService.getSite(FilePlanService.DEFAULT_RM_SITE_ID);
-        if(siteInfo !=null)
-        {
-            NodeRef rmNodeRef = siteInfo.getNodeRef();
-            if(rmNodeRef.equals(parentNodeRef))
-            {
-                throw new PermissionDeniedException("POST request not allowed in RM site.");
-            }
-        }
-    }
 }

rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/FileplanComponentChildrenRelation.java

@@ -67,7 +67,6 @@ public class FileplanComponentChildrenRelation implements RelationshipResourceAc
     @Override
     public List<Node> create(String parentFolderNodeId, List<Node> nodeInfos, Parameters parameters)
     {
-        nodes.checkPostPermission(parentFolderNodeId);
         List<Node> result = new ArrayList<>(nodeInfos.size());
 
         for (Node nodeInfo : nodeInfos)
@@ -81,7 +80,6 @@ public class FileplanComponentChildrenRelation implements RelationshipResourceAc
     @Override
     public Node create(String parentFolderNodeId, FormData formData, Parameters parameters, WithResponse withResponse)
     {
-        nodes.checkPostPermission(parentFolderNodeId);
         return nodes.upload(parentFolderNodeId, formData, parameters);
     }
 }

rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java

@@ -51,7 +51,6 @@ import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.model.rma.type.HoldType;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;

rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldTypeUnitTest.java

@@ -1,72 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.security.InvalidParameterException;
-
-import org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock;
-import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.namespace.QName;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-
-/**
- * Unit test for HoldType
- *
- * @author Silviu Dinuta
- * @since 2.6
- *
- */
-public class HoldTypeUnitTest extends BaseUnitTest
-{
-    /** test object */
-    private @InjectMocks HoldType holdType;
-
-    /**
-     * Given that we try to add to hold folder,
-     * Then InvalidParameterException is thrown.
-     */
-    @Test(expected = InvalidParameterException.class)
-    public void testAddToHoldFolderTest()
-    {
-        NodeRef holdFolder = generateNodeRef(TYPE_HOLD, true);
-
-        QName type = AlfMock.generateQName();
-        NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type);
-
-        ChildAssociationRef mockedChildAssoc = mock(ChildAssociationRef.class);
-        when(mockedChildAssoc.getChildRef()).thenReturn(nodeRef);
-        when(mockedChildAssoc.getParentRef()).thenReturn(holdFolder);
-        holdType.onCreateChildAssociation(mockedChildAssoc, true);
-    }
-}

rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMNodesImplUnitTest.java

@@ -65,7 +65,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
-import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
@@ -725,45 +724,6 @@ public class RMNodesImplUnitTest extends BaseUnitTest
         verify(mockedFileFolderService, never()).delete(nodeRef);
     }
 
-    @Test
-    public void testCheckPostPermissionForRMSite() throws Exception
-    {
-        NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-        SiteInfo mockedSiteInfo = mock(SiteInfo.class);
-        when(mockedSiteInfo.getNodeRef()).thenReturn(parentNodeRef);
-        when(mockedSiteService.getSite(RM_SITE_ID)).thenReturn(mockedSiteInfo);
-
-        try
-        {
-            rmNodesImpl.checkPostPermission(parentNodeRef.getId());
-            fail("Expected ecxeption as post should not be permitted on the RM site");
-        }
-        catch(PermissionDeniedException ex)
-        {
-            assertEquals("POST request not allowed in RM site.", ex.getMsgId());
-        }
-    }
-
-    @Test
-    public void testCheckPostPermissionForNormalNodeRefWhenRMSiteExists() throws Exception
-    {
-        NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-        NodeRef rmSiteNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-        SiteInfo mockedSiteInfo = mock(SiteInfo.class);
-        when(mockedSiteInfo.getNodeRef()).thenReturn(rmSiteNodeRef);
-        when(mockedSiteService.getSite(RM_SITE_ID)).thenReturn(mockedSiteInfo);
-        rmNodesImpl.checkPostPermission(parentNodeRef.getId());
-    }
-
-    @Test
-    public void testCheckPostPermission() throws Exception
-    {
-        NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-        QName type = AlfMock.generateQName();
-        when(mockedNodeService.getType(parentNodeRef)).thenReturn(type);
-        rmNodesImpl.checkPostPermission(parentNodeRef.getId());
-    }
-
     private void setupCompanyHomeAndPrimaryParent(NodeRef nodeRef)
     {
         NodeRef companyHomeNodeRef = AlfMock.generateNodeRef(mockedNodeService);

rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/nodes/FileplanComponentChildrenRelationUnitTest.java

@@ -28,10 +28,7 @@
 package org.alfresco.rm.rest.api.nodes;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -41,7 +38,6 @@ import java.util.List;
 import org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
 import org.alfresco.rest.api.model.Node;
-import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
 import org.alfresco.rm.rest.api.impl.RMNodesImpl;
@@ -50,7 +46,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.springframework.extensions.webscripts.servlet.FormData;
 
@@ -99,29 +94,6 @@ public class FileplanComponentChildrenRelationUnitTest extends BaseUnitTest
         verify(mockedRMNodes, times(1)).createNode(parentNodeRef.getId(), nodeInfos.get(0), mockedParameters);
     }
 
-    @Test
-    public void testCreateOnRMSite() throws Exception
-    {
-        Parameters mockedParameters = mock(Parameters.class);
-        NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-
-        List<Node> nodeInfos = new ArrayList<Node>();
-        Node mokedNodeInfo = mock(Node.class);
-        nodeInfos.add(mokedNodeInfo);
-
-        Mockito.doThrow(new PermissionDeniedException("POST request not allowed in RM site.")).when(mockedRMNodes).checkPostPermission(parentNodeRef.getId());
-        try
-        {
-            filePlanComponentChildrenRelation.create(parentNodeRef.getId(), nodeInfos, mockedParameters);
-            fail("Expected ecxeption as POST request is not allowed in RM site.");
-        }
-        catch(PermissionDeniedException ex)
-        {
-            assertEquals("POST request not allowed in RM site.", ex.getMsgId());
-        }
-        verify(mockedRMNodes, never()).createNode(parentNodeRef.getId(), nodeInfos.get(0), mockedParameters);
-    }
-
     @Test
     public void testUpload() throws Exception
     {
@@ -132,25 +104,4 @@ public class FileplanComponentChildrenRelationUnitTest extends BaseUnitTest
         filePlanComponentChildrenRelation.create(parentNodeRef.getId(), mockedFormData, mockedParameters, mockedWithResponse);
         verify(mockedRMNodes, times(1)).upload(parentNodeRef.getId(), mockedFormData, mockedParameters);
     }
-
-    @Test
-    public void testUploadOnRMSite() throws Exception
-    {
-        Parameters mockedParameters = mock(Parameters.class);
-        NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService);
-        FormData mockedFormData = mock(FormData.class);
-        WithResponse mockedWithResponse = mock(WithResponse.class);
-
-        Mockito.doThrow(new PermissionDeniedException("POST request not allowed in RM site.")).when(mockedRMNodes).checkPostPermission(parentNodeRef.getId());
-        try
-        {
-            filePlanComponentChildrenRelation.create(parentNodeRef.getId(), mockedFormData, mockedParameters, mockedWithResponse);
-            fail("Expected ecxeption as POST request is not allowed in RM site.");
-        }
-        catch(PermissionDeniedException ex)
-        {
-            assertEquals("POST request not allowed in RM site.", ex.getMsgId());
-        }
-        verify(mockedRMNodes, never()).upload(parentNodeRef.getId(), mockedFormData, mockedParameters);
-    }
 }