inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
73883: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73717:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         73669: MNT-11163: CMIS - querying for folders raises CmisPermissionDeniedException 
           - CmisPermissionDeniedException is fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:11:26 +00:00
parent 176c2069be
commit 20fe538cb3
2 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/test-java/org/alfresco/opencmis/search/OpenCmisQueryTest.java
View File

@@ -74,6 +74,7 @@ import org.alfresco.repo.search.impl.parsers.FTSQueryException;
import org.alfresco.repo.search.impl.querymodel.Order;
import org.alfresco.repo.search.impl.querymodel.QueryModelException;
import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -197,6 +198,10 @@ public class OpenCmisQueryTest extends BaseCMISTest
private NodeRef f9;
private NodeRef forAdminFolder;
private NodeRef forEveryoneFolder;
private NodeRef c0;
private NodeRef c1;
@@ -5647,6 +5652,70 @@ public class OpenCmisQueryTest extends BaseCMISTest
testOrderablePropertyFail("test:multipleBoolean");
}
/**
* MNT-11163 test:
* <p/>
* Assume there is a folder 'A' with admin access only and subfolder 'B' with permissions EVERYONE Contributor.
* The folder's structure:
*<pre>
* repository
* |
* -A
* |
* -B
*</pre>
* The CMIS query <code>SELECT * FROM cmis:folder</code> should not raise CmisPermissionDeniedException. Returned path for 'A' or 'B' nodes should be null.
*/
public void testParentWithPermissions() throws Exception
{
String userName = "cmis";
final String forAdminFolderName = "For admin folder";
forAdminFolder = nodeService.createNode(base, ContentModel.ASSOC_CONTAINS,
QName.createQName("cm", forAdminFolderName, namespaceService),
ContentModel.TYPE_FOLDER).getChildRef();
nodeService.setProperty(forAdminFolder, ContentModel.PROP_NAME, forAdminFolderName);
// deny access for test user to 'forAdminFolder'
permissionService.setPermission(forAdminFolder, userName, PermissionService.ALL_PERMISSIONS, false);
String forEveryoneFolderName = "For everyone folder";
forEveryoneFolder = nodeService.createNode(forAdminFolder,
ContentModel.ASSOC_CONTAINS,
QName.createQName("cm", forEveryoneFolderName, namespaceService),
ContentModel.TYPE_FOLDER).getChildRef();
nodeService.setProperty(forEveryoneFolder, ContentModel.PROP_NAME, forEveryoneFolderName);
// set access for test to 'forEveryOneFOlder'
permissionService.setPermission(forEveryoneFolder, userName, PermissionService.ALL_PERMISSIONS, true);
final CMISQueryOptions options = new CMISQueryOptions("SELECT * FROM cmis:folder", rootNodeRef.getStoreRef());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Serializable>()
{
@Override
public Serializable doWork() throws Exception
{
CMISResultSet rs = cmisQueryService.query(options);
for (CMISResultSetRow row : rs)
{
if (!row.getNodeRef().equals(base))
{
NodeRef ref = row.getNodeRef();
if (ref.equals(forEveryoneFolder))
{
Serializable sValue = row.getValue("cmis:path");
assertEquals("The path for '" + forAdminFolderName + "' should be null", null, sValue);
}
else if (ref.equals(forAdminFolder))
{
assertTrue("Should not get the path for '" + forAdminFolderName + "'",false);
}
}
}
return null;
}
}, userName);
}
public void testNonQueryableTypes() throws Exception
{
testQuery("SELECT * FROM cmis:policy", 0, false, "cmis:name", new String(), true);