Merge remote-tracking branch 'origin/develop' into fix/MNT-17970_recipientListForGroups

This commit is contained in:
Andreea Nechifor
2017-09-15 16:49:55 +03:00
12 changed files with 324 additions and 149 deletions

3
.gitignore vendored
View File

@@ -32,3 +32,6 @@ target
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
alf_data
/src/main/resources/alfresco-global.properties
/src/main/resources/alfresco/extension/custom-log4j.properties

View File

@@ -40,7 +40,7 @@
<dependency.alfresco-mbeans.version>6.0</dependency.alfresco-mbeans.version>
<dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>
<dependency.alfresco-greenmail.version>6.0</dependency.alfresco-greenmail.version>
<dependency.alfresco-data-model.version>6.17</dependency.alfresco-data-model.version>
<dependency.alfresco-data-model.version>6.18</dependency.alfresco-data-model.version>
<dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version>
<dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>

View File

@@ -1283,11 +1283,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
throw new CmisConstraintException("This document type does requires content!");
}
if (docType.isVersionable() && (versioningState == VersioningState.NONE))
{
throw new CmisConstraintException("This document type is versionable!");
}
if (!docType.isVersionable() && (versioningState != VersioningState.NONE))
{
throw new CmisConstraintException("This document type is not versionable!");

View File

@@ -31,6 +31,7 @@ import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.domain.node.NodeIdAndAclId;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.repo.domain.permissions.AclDAO;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.ACLType;
import org.alfresco.repo.security.permissions.AccessControlEntry;
import org.alfresco.repo.security.permissions.AccessControlList;
@@ -99,62 +100,70 @@ public class SitesPermissionCleaner
public void cleanSitePermissions(final NodeRef targetNode, SiteInfo containingSite)
{
if (nodeDAO.exists(targetNode))
if (!nodeDAO.exists(targetNode))
{
// We can calculate the containing site at the start of a recursive call & then reuse it on subsequent calls.
if (containingSite == null)
{
containingSite = siteServiceImpl.getSite(targetNode);
}
return;
}
// We can calculate the containing site at the start of a recursive call & then reuse it on subsequent calls.
if (containingSite == null)
{
containingSite = siteServiceImpl.getSite(targetNode);
}
// Short-circuit at this point if the node is not in a Site.
if (containingSite != null)
{
// For performance reasons we navigate down the containment hierarchy using the DAOs
// rather than the NodeService. Note: direct use of NodeDAO requires tenantService (ALF-12732).
final Long targetNodeID = nodeDAO.getNodePair(tenantService.getName(targetNode)).getFirst();
final Long targetNodeAclID = nodeDAO.getNodeAclId(targetNodeID);
Acl targetNodeAcl = aclDAO.getAcl(targetNodeAclID);
// Short-circuit at this point if the node is not in a Site.
if (containingSite == null)
{
return;
}
// For performance reasons we navigate down the containment hierarchy using the DAOs
// rather than the NodeService. Note: direct use of NodeDAO requires tenantService (ALF-12732).
final Long targetNodeID = nodeDAO.getNodePair(tenantService.getName(targetNode)).getFirst();
final Long targetNodeAclID = nodeDAO.getNodeAclId(targetNodeID);
Acl targetNodeAcl = aclDAO.getAcl(targetNodeAclID);
// Nodes that don't have defining ACLs do not need to be considered.
if (targetNodeAcl.getAclType() == ACLType.DEFINING)
// Nodes that don't have defining ACLs do not need to be considered.
if (targetNodeAcl.getAclType() == ACLType.DEFINING)
{
AccessControlList targetNodeAccessControlList = aclDAO.getAccessControlList(targetNodeAclID);
List<AccessControlEntry> targetNodeAclEntries = targetNodeAccessControlList.getEntries();
for (AccessControlEntry entry : targetNodeAclEntries)
{
String authority = entry.getAuthority();
String thisSiteGroupPrefix = siteServiceImpl.getSiteGroup(containingSite.getShortName(), true);
// If it's a group site permission for a site other than the current site
if (authority.startsWith(PermissionService.GROUP_PREFIX) &&
// And it's not GROUP_EVERYONE
!authority.startsWith(PermissionService.ALL_AUTHORITIES) && !authority.startsWith(thisSiteGroupPrefix) &&
// And if the current user has permissions to do it
publicServiceAccessService.hasAccess("PermissionService", "clearPermission", targetNode, authority) == AccessStatus.ALLOWED)
{
AccessControlList targetNodeAccessControlList = aclDAO.getAccessControlList(targetNodeAclID);
List<AccessControlEntry> targetNodeAclEntries = targetNodeAccessControlList.getEntries();
for (AccessControlEntry entry : targetNodeAclEntries)
{
String authority = entry.getAuthority();
String thisSiteGroupPrefix = siteServiceImpl.getSiteGroup(containingSite.getShortName(), true);
// If it's a group site permission for a site other than the current site
if (authority.startsWith(PermissionService.GROUP_PREFIX) &&
!authority.startsWith(PermissionService.ALL_AUTHORITIES) && // And it's not GROUP_EVERYONE
!authority.startsWith(thisSiteGroupPrefix))
{
// And if the current user has permissions to do it
if (publicServiceAccessService.hasAccess("PermissionService", "clearPermission", targetNode, authority) == AccessStatus.ALLOWED)
{
// Then remove it.
permissionService.clearPermission(targetNode, authority);
}
if (publicServiceAccessService.hasAccess("PermissionService", "setInheritParentPermissions", targetNode, true) == AccessStatus.ALLOWED)
{
// And reenable permission inheritance.
permissionService.setInheritParentPermissions(targetNode, true);
}
}
}
// Then remove it.
permissionService.clearPermission(targetNode, authority);
}
// Recurse
List<NodeIdAndAclId> childNodeIds = nodeDAO.getPrimaryChildrenAcls(targetNodeID);
for (NodeIdAndAclId nextChild : childNodeIds)
if (!permissionService.getInheritParentPermissions(targetNode))
{
cleanSitePermissions(nodeDAO.getNodePair(nextChild.getId()).getSecond(), containingSite);
// The site manager from the new site, where this node was moved to, has to have permission to this node
String siteManagerAuthority = thisSiteGroupPrefix + "_" + SiteModel.SITE_MANAGER;
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
{
public Void doWork() throws Exception
{
permissionService.setPermission(targetNode, siteManagerAuthority, SiteModel.SITE_MANAGER, true);
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
}
}
// Recurse
List<NodeIdAndAclId> childNodeIds = nodeDAO.getPrimaryChildrenAcls(targetNodeID);
for (NodeIdAndAclId nextChild : childNodeIds)
{
cleanSitePermissions(nodeDAO.getNodePair(nextChild.getId()).getSecond(), containingSite);
}
}
}

View File

@@ -29,7 +29,6 @@
#
#img.coders=${img.root}/modules/coders
#img.config=${img.root}/config
#img.gslib=${img.root}/lib
#
# Property to control whether schema updates are performed automatically.

View File

@@ -20,7 +20,7 @@
</entry>
</map>
</property>
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'processPropertiesWindows' : 'processPropertiesUnix'}" />
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesWindows' : 'transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesUnix'}" />
<property name="defaultProperties">
<props>
<prop key="options"></prop>
@@ -47,7 +47,7 @@
</property>
</bean>
<bean id="processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="ALFRESCO-PDF-RENDERER_HOME">
@@ -57,7 +57,7 @@
</property>
</bean>
<bean id="processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="ALFRESCO-PDF-RENDERER_HOME">

View File

@@ -22,7 +22,7 @@
</entry>
</map>
</property>
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'processPropertiesWindows' : 'processPropertiesUnix'}" />
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'transformer.worker.ImageMagick.processPropertiesWindows' : 'transformer.worker.ImageMagick.processPropertiesUnix'}" />
<property name="defaultProperties">
<props>
<prop key="options"></prop>
@@ -50,7 +50,7 @@
</property>
</bean>
<bean id="processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.ImageMagick.processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="MAGICK_HOME">
@@ -62,9 +62,6 @@
<entry key="MAGICK_CONFIGURE_PATH">
<value>${img.config}</value>
</entry>
<entry key="GS_LIB">
<value>${img.gslib}</value>
</entry>
<entry key="DYLD_FALLBACK_LIBRARY_PATH">
<value>${img.dyn}</value>
</entry>
@@ -75,7 +72,7 @@
</property>
</bean>
<bean id="processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.ImageMagick.processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="MAGICK_HOME">

View File

@@ -4,4 +4,3 @@ img.dyn=${img.root}/lib
img.exe=${img.root}/bin/convert
img.coders=${img.root}/modules/coders
img.config=${img.root}/config
img.gslib=

View File

@@ -3669,6 +3669,64 @@ public class CMISTest
}
}
@Test
public void testCreateDocWithVersioningStateNone() throws Exception
{
AuthenticationUtil.pushAuthentication();
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
try
{
// get repository id
final String repositoryId = withCmisService(new CmisServiceCallback<String>()
{
@Override
public String execute(CmisService cmisService)
{
List<RepositoryInfo> repositories = cmisService.getRepositoryInfos(null);
assertTrue(repositories.size() > 0);
RepositoryInfo repo = repositories.get(0);
final String repositoryId = repo.getId();
return repositoryId;
}
}, CmisVersion.CMIS_1_1);
final NodeRef documentNodeRef = withCmisService(new CmisServiceCallback<NodeRef>()
{
@Override
public NodeRef execute(CmisService cmisService)
{
final PropertiesImpl properties = new PropertiesImpl();
String objectTypeId = "cmis:document";
properties.addProperty(new PropertyIdImpl(PropertyIds.OBJECT_TYPE_ID, objectTypeId));
String fileName = "textFile" + GUID.generate();
properties.addProperty(new PropertyStringImpl(PropertyIds.NAME, fileName));
final ContentStreamImpl contentStream = new ContentStreamImpl(fileName, MimetypeMap.MIMETYPE_TEXT_PLAIN, "Simple text plain document");
String nodeId = cmisService.create(repositoryId, properties, repositoryHelper.getCompanyHome().getId(), contentStream, VersioningState.NONE, null, null);
return new NodeRef(nodeId.substring(0, nodeId.indexOf(';')));
}
}, CmisVersion.CMIS_1_1);
// check versioning properties
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<Void>>()
{
@Override
public List<Void> execute() throws Throwable
{
assertTrue(nodeService.exists(documentNodeRef));
assertFalse(nodeService.hasAspect(documentNodeRef, ContentModel.ASPECT_VERSIONABLE));
return null;
}
});
}
finally
{
AuthenticationUtil.popAuthentication();
}
}
/**
* MNT-14951: Test that the list of parents can be retrieved for a folder.
*/

View File

@@ -77,17 +77,23 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
* Checks that we correctly handle text in different encodings,
* no matter if the encoding is specified on the Content Property
* or in a meta tag within the HTML itself. (ALF-10466)
*
* On Windows, org.htmlparser.beans.StringBean.carriageReturn() appends a new system dependent new line
* so we must be careful when checking the returned text
*/
public void testEncodingHandling() throws Exception
{
final String NEWLINE = System.getProperty ("line.separator");
final String TITLE = "Testing!";
final String TEXT_P1 = "This is some text in English";
final String TEXT_P2 = "This is more text in English";
final String TEXT_P3 = "C'est en Fran\u00e7ais et Espa\u00f1ol";
String partA = "<html><head><title>"+TITLE+"</title>";
String partB = "</head>\n<body><p>"+TEXT_P1+"</p>\n" +
"<p>"+TEXT_P2+"</p>\n" + "<p>"+TEXT_P3+"</p>\n";
String partA = "<html><head><title>" + TITLE + "</title></head>" + NEWLINE;
String partB = "<body><p>" + TEXT_P1 + "</p>" + NEWLINE +
"<p>" + TEXT_P2 + "</p>" + NEWLINE +
"<p>" + TEXT_P3 + "</p>" + NEWLINE;
String partC = "</body></html>";
final String expected = TITLE + NEWLINE + TEXT_P1 + NEWLINE + TEXT_P2 + NEWLINE + TEXT_P3 + NEWLINE;
ContentWriter content;
ContentWriter dest;
@@ -108,10 +114,8 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest);
assertEquals(
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
assertEquals(expected, dest.getReader().getContentString());
tmpS.delete();
tmpD.delete();
@@ -128,10 +132,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest);
assertEquals(
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
assertEquals(expected, dest.getReader().getContentString());
tmpS.delete();
tmpD.delete();
@@ -148,10 +149,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest);
assertEquals(
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
assertEquals(expected, dest.getReader().getContentString());
tmpS.delete();
tmpD.delete();
@@ -178,10 +176,7 @@ public class HtmlParserContentTransformerTest extends AbstractContentTransformer
dest.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
transformer.transform(content.getReader(), dest);
assertEquals(
TITLE + "\n" + TEXT_P1 + "\n" + TEXT_P2 + "\n" + TEXT_P3 + "\n",
dest.getReader().getContentString()
);
assertEquals(expected, dest.getReader().getContentString());
tmpS.delete();
tmpD.delete();

View File

@@ -120,6 +120,18 @@ public class ImageMagickContentTransformerTest extends AbstractContentTransforme
}
}
public void testGifToPng() throws Exception
{
ImageTransformationOptions options = new ImageTransformationOptions();
transform(MimetypeMap.MIMETYPE_IMAGE_GIF, MimetypeMap.MIMETYPE_IMAGE_PNG, options);
}
public void testJpegToPng() throws Exception
{
ImageTransformationOptions options = new ImageTransformationOptions();
transform(MimetypeMap.MIMETYPE_IMAGE_JPEG, MimetypeMap.MIMETYPE_IMAGE_PNG, options);
}
public void testPageSourceOptions() throws Exception
{
// Test empty source options

View File

@@ -64,6 +64,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.CopyService;
@@ -91,7 +92,6 @@ import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap;
import org.junit.experimental.categories.Category;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -1168,6 +1168,114 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
}
}
/**
* This is an integration test for MNT-18014
*/
public void testMoveFolderStructureWithNonInheritedPermission()
{
//Login to share as the admin user
AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
// Create 2 sites test1, test2 as admin
String test1SiteShortName = "test1" + GUID.generate();
String test2SiteShortName = "test2" + GUID.generate();
createSite(test1SiteShortName, SiteService.DOCUMENT_LIBRARY, SiteVisibility.PUBLIC);
createSite(test2SiteShortName, SiteService.DOCUMENT_LIBRARY, SiteVisibility.PUBLIC);
SiteInfo test1SiteInfo = this.siteService.getSite(test1SiteShortName);
assertNotNull(test1SiteInfo);
SiteInfo test2SiteInfo = this.siteService.getSite(test2SiteShortName);
assertNotNull(test2SiteInfo);
// add user1 (USER_ONE) and user2 (USER_TWO) as managers on test1 site (test1SiteInfo)
siteService.setMembership(test1SiteShortName, USER_ONE, SiteModel.SITE_MANAGER);
siteService.setMembership(test1SiteShortName, USER_TWO, SiteModel.SITE_MANAGER);
// Give manager role to user1 to test2
siteService.setMembership(test2SiteShortName, USER_ONE, SiteModel.SITE_MANAGER);
// Log in as user2
AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
// In document library of test1, create fol1 containing fol2 containing fol3
NodeRef documentLibraryTest1Site = siteService.getContainer(test1SiteShortName, SiteService.DOCUMENT_LIBRARY);
assertNotNull(documentLibraryTest1Site);
NodeRef fol1 = this.fileFolderService.create(documentLibraryTest1Site, "fol1-" + GUID.generate(), ContentModel.TYPE_FOLDER).getNodeRef();
NodeRef fol2 = this.fileFolderService.create(fol1, "fol2-" + GUID.generate(), ContentModel.TYPE_FOLDER).getNodeRef();
NodeRef fol3 = this.fileFolderService.create(fol2, "fol3-" + GUID.generate(), ContentModel.TYPE_FOLDER).getNodeRef();
// Cut inheritance on fol2
permissionService.setInheritParentPermissions(fol2, false);
// this is what happens when called from Share : permissions.post:
// var siteManagerAuthority = "GROUP_site_" + location.site + "_SiteManager";
// // Insure Site Managers can still manage content.
// node.setPermission("SiteManager", siteManagerAuthority);
String test1SiteGroupPrefix = siteServiceImpl.getSiteGroup(test1SiteShortName, true);
String test1SiteManagerAuthority = test1SiteGroupPrefix + "_" + SiteModel.SITE_MANAGER;
permissionService.setPermission(fol2, test1SiteManagerAuthority, SiteModel.SITE_MANAGER, true);
// Log in as user1, go to site test1
AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
// Check that user1 can see fol1 fol2 fol3
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(documentLibraryTest1Site);
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol1", getFirstName(childAssocs).startsWith("fol1"));
childAssocs = nodeService.getChildAssocs(childAssocs.get(0).getChildRef());
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol2", getFirstName(childAssocs).startsWith("fol2"));
childAssocs = nodeService.getChildAssocs(childAssocs.get(0).getChildRef());
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol3", getFirstName(childAssocs).startsWith("fol3"));
NodeRef documentLibraryTest2Site = siteService.getContainer(test2SiteShortName, SiteService.DOCUMENT_LIBRARY);
assertNotNull(documentLibraryTest2Site);
childAssocs = nodeService.getChildAssocs(documentLibraryTest2Site);
assertTrue("Folder should be empty.", childAssocs.isEmpty());
// Move fol1 to site test2
ChildAssociationRef childAssociationRef = nodeService.moveNode(fol1, documentLibraryTest2Site, ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, GUID.generate()));
// This is what Share does:
// move the node
//result.success = fileNode.move(parent, destNode);
//
//if (result.success)
//{
// // If this was an inter-site move, we'll need to clean up the permissions on the node
// if ((fromSite) && (String(fromSite) !== String(fileNode.siteShortName)))
// {
// siteService.cleanSitePermissions(fileNode);
// }
//}
siteService.cleanSitePermissions(fol1, test2SiteInfo);
childAssocs = nodeService.getChildAssocs(documentLibraryTest1Site);
assertTrue("test1Site document library should be empty.", childAssocs.isEmpty());
assertFalse("After the move the folder should keep the inherit permission value(false).",
permissionService.getInheritParentPermissions(fol2));
// Go to the site test2's document library and click on fol1
// user1 is able to see the contents of fol1
childAssocs = nodeService.getChildAssocs(documentLibraryTest2Site);
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol1", getFirstName(childAssocs).startsWith("fol1"));
childAssocs = nodeService.getChildAssocs(childAssocs.get(0).getChildRef());
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol2", getFirstName(childAssocs).startsWith("fol2"));
childAssocs = nodeService.getChildAssocs(childAssocs.get(0).getChildRef());
assertEquals("Size should be 1", 1, childAssocs.size());
assertTrue("Folder name should start with fol3", getFirstName(childAssocs).startsWith("fol3"));
}
private String getFirstName(List<ChildAssociationRef> childAssocs)
{
return nodeService.getProperties(childAssocs.get(0).getChildRef()).get(ContentModel.PROP_NAME).toString();
}
public void testDeleteSite()
{
@SuppressWarnings("deprecation")