inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126535 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123185 jvonka: RA-706, ACE-5113: Revese merge 123162 & 123163 (needs more thought, re: impact on existing tests etc)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:03:25 +00:00
parent 9aeabb0398
commit 76971dbbf3
3 changed files with 38 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/ownable-services-context.xml
View File

@@ -24,8 +24,5 @@
<property name="renditionService"> <property name="renditionService">
<ref bean="renditionService"/> <ref bean="renditionService"/>
</property> </property>
<property name="personService">
<ref bean="personService"/>
</property>
</bean> </bean>
</beans> </beans>

28
source/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
View File

@@ -51,9 +51,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.NoSuchPersonException;
import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper; import org.alfresco.util.EqualsHelper;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
@@ -78,7 +76,6 @@ public class OwnableServiceImpl implements
private TenantService tenantService; private TenantService tenantService;
private Set<String> storesToIgnorePolicies = Collections.emptySet(); private Set<String> storesToIgnorePolicies = Collections.emptySet();
private RenditionService renditionService; private RenditionService renditionService;
private PersonService personService;
public OwnableServiceImpl() public OwnableServiceImpl()
{ {
@@ -130,11 +127,6 @@ public class OwnableServiceImpl implements
this.renditionService = renditionService; this.renditionService = renditionService;
} }
public void setPersonService(PersonService personService)
{
this.personService = personService;
}
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {
PropertyCheck.mandatory(this, "nodeService", nodeService); PropertyCheck.mandatory(this, "nodeService", nodeService);
@@ -142,7 +134,6 @@ public class OwnableServiceImpl implements
PropertyCheck.mandatory(this, "nodeOwnerCache", nodeOwnerCache); PropertyCheck.mandatory(this, "nodeOwnerCache", nodeOwnerCache);
PropertyCheck.mandatory(this, "policyComponent", policyComponent); PropertyCheck.mandatory(this, "policyComponent", policyComponent);
PropertyCheck.mandatory(this, "renditionService", renditionService); PropertyCheck.mandatory(this, "renditionService", renditionService);
PropertyCheck.mandatory(this, "personService", personService);
} }
public void init() public void init()
@@ -287,25 +278,6 @@ public class OwnableServiceImpl implements
if (!EqualsHelper.nullSafeEquals(pb, pa)) if (!EqualsHelper.nullSafeEquals(pb, pa))
{ {
if (pa != null)
{
String username = (String) pa;
NodeRef personNodeRef = null;
// validate that user authentication exists
if (authenticationService.authenticationExists(username))
{
// validate that person exists
// note: will attempt to create missing person, if allowed - may throw NoSuchPersonException
personNodeRef = personService.getPerson(username, true);
}
if (personNodeRef == null)
{
throw new NoSuchPersonException(username);
}
}
nodeOwnerCache.remove(nodeRef); nodeOwnerCache.remove(nodeRef);
return; return;
} }

97
source/test-java/org/alfresco/repo/ownable/impl/OwnableServiceTest.java
View File

@@ -45,7 +45,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.NoSuchPersonException;
import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
@@ -59,10 +58,6 @@ import org.springframework.context.ApplicationContext;
public class OwnableServiceTest extends TestCase public class OwnableServiceTest extends TestCase
{ {
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private static final String USER_ANDY = "andy";
private static final String USER_WOOF = "woof";
private static final String USER_MUPPET = "muppet";
private NodeService nodeService; private NodeService nodeService;
@@ -118,25 +113,18 @@ public class OwnableServiceTest extends TestCase
StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis()); StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
rootNodeRef = nodeService.getRootNode(storeRef); rootNodeRef = nodeService.getRootNode(storeRef);
permissionService.setPermission(rootNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ADD_CHILDREN, true); permissionService.setPermission(rootNodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ADD_CHILDREN, true);
reCreateUser(USER_ANDY, USER_ANDY); if(authenticationDAO.userExists("andy"))
reCreateUser(USER_WOOF, USER_WOOF); {
reCreateUser(USER_MUPPET, USER_MUPPET); authenticationService.deleteAuthentication("andy");
}
authenticationService.createAuthentication("andy", "andy".toCharArray());
dynamicAuthority = new OwnerDynamicAuthority(); dynamicAuthority = new OwnerDynamicAuthority();
dynamicAuthority.setOwnableService(ownableService); dynamicAuthority.setOwnableService(ownableService);
authenticationComponent.clearCurrentSecurityContext(); authenticationComponent.clearCurrentSecurityContext();
} }
private void reCreateUser(String username, String password)
{
if(authenticationDAO.userExists(username))
{
authenticationService.deleteAuthentication(username);
}
authenticationService.createAuthentication(username, password.toCharArray());
}
@Override @Override
protected void tearDown() throws Exception protected void tearDown() throws Exception
@@ -168,22 +156,22 @@ public class OwnableServiceTest extends TestCase
public void testCMObject() public void testCMObject()
{ {
authenticationService.authenticate(USER_ANDY, USER_ANDY.toCharArray()); authenticationService.authenticate("andy", "andy".toCharArray());
NodeRef testNode = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_PERSON, ContentModel.TYPE_CMOBJECT, null).getChildRef(); NodeRef testNode = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_PERSON, ContentModel.TYPE_CMOBJECT, null).getChildRef();
permissionService.setPermission(rootNodeRef, USER_ANDY, PermissionService.TAKE_OWNERSHIP, true); permissionService.setPermission(rootNodeRef, "andy", PermissionService.TAKE_OWNERSHIP, true);
assertEquals(USER_ANDY, ownableService.getOwner(testNode)); assertEquals("andy", ownableService.getOwner(testNode));
assertTrue(ownableService.hasOwner(testNode)); assertTrue(ownableService.hasOwner(testNode));
assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE)); assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE));
assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE)); assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE));
assertTrue(dynamicAuthority.hasAuthority(testNode, USER_ANDY)); assertTrue(dynamicAuthority.hasAuthority(testNode, "andy"));
assertEquals(USER_ANDY, ownableService.getOwner(testNode)); assertEquals("andy", ownableService.getOwner(testNode));
// nodeService.setProperty(testNode, ContentModel.PROP_CREATOR, USER_WOOF); // nodeService.setProperty(testNode, ContentModel.PROP_CREATOR, "woof");
// assertEquals(USER_WOOF, ownableService.getOwner(testNode)); // assertEquals("woof", ownableService.getOwner(testNode));
// //
// nodeService.setProperty(testNode, ContentModel.PROP_CREATOR, USER_ANDY); // nodeService.setProperty(testNode, ContentModel.PROP_CREATOR, "andy");
// assertEquals(USER_ANDY, ownableService.getOwner(testNode)); // assertEquals("andy", ownableService.getOwner(testNode));
// //
permissionService.setInheritParentPermissions(testNode, false); permissionService.setInheritParentPermissions(testNode, false);
@@ -193,7 +181,7 @@ public class OwnableServiceTest extends TestCase
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP));
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER));
permissionService.setPermission(rootNodeRef, USER_ANDY, PermissionService.WRITE_PROPERTIES, true); permissionService.setPermission(rootNodeRef, "andy", PermissionService.WRITE_PROPERTIES, true);
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(rootNodeRef, PermissionService.TAKE_OWNERSHIP)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(rootNodeRef, PermissionService.TAKE_OWNERSHIP));
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(rootNodeRef, PermissionService.SET_OWNER)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(rootNodeRef, PermissionService.SET_OWNER));
@@ -202,23 +190,23 @@ public class OwnableServiceTest extends TestCase
ownableService.setOwner(testNode, USER_WOOF); ownableService.setOwner(testNode, "woof");
assertEquals(USER_WOOF, ownableService.getOwner(testNode)); assertEquals("woof", ownableService.getOwner(testNode));
assertTrue(dynamicAuthority.hasAuthority(testNode, USER_WOOF)); assertTrue(dynamicAuthority.hasAuthority(testNode, "woof"));
assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP));
assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER));
ownableService.setOwner(testNode, USER_MUPPET); ownableService.setOwner(testNode, "muppet");
assertEquals(USER_MUPPET, ownableService.getOwner(testNode)); assertEquals("muppet", ownableService.getOwner(testNode));
assertTrue(dynamicAuthority.hasAuthority(testNode, USER_MUPPET)); assertTrue(dynamicAuthority.hasAuthority(testNode, "muppet"));
assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP));
assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER)); assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER));
ownableService.takeOwnership(testNode); ownableService.takeOwnership(testNode);
assertEquals(USER_ANDY, ownableService.getOwner(testNode)); assertEquals("andy", ownableService.getOwner(testNode));
assertTrue(dynamicAuthority.hasAuthority(testNode, USER_ANDY)); assertTrue(dynamicAuthority.hasAuthority(testNode, "andy"));
assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE)); assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE));
assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE)); assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE));
@@ -227,50 +215,41 @@ public class OwnableServiceTest extends TestCase
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.TAKE_OWNERSHIP));
assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(testNode, PermissionService.SET_OWNER));
nodeService.setProperty(testNode, ContentModel.PROP_OWNER, USER_MUPPET); nodeService.setProperty(testNode, ContentModel.PROP_OWNER, "muppet");
assertEquals(USER_MUPPET, ownableService.getOwner(testNode)); assertEquals("muppet", ownableService.getOwner(testNode));
nodeService.removeAspect(testNode, ContentModel.ASPECT_OWNABLE); nodeService.removeAspect(testNode, ContentModel.ASPECT_OWNABLE);
assertEquals(USER_ANDY, ownableService.getOwner(testNode)); assertEquals("andy", ownableService.getOwner(testNode));
HashMap<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(); HashMap<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
aspectProperties.put(ContentModel.PROP_OWNER, USER_MUPPET); aspectProperties.put(ContentModel.PROP_OWNER, "muppet");
nodeService.addAspect(testNode, ContentModel.ASPECT_OWNABLE, aspectProperties); nodeService.addAspect(testNode, ContentModel.ASPECT_OWNABLE, aspectProperties);
assertEquals(USER_MUPPET, ownableService.getOwner(testNode)); assertEquals("muppet", ownableService.getOwner(testNode));
// -ve test
try
{
ownableService.setOwner(testNode, "unknownuserdoesnotexist");
fail("Unexpected - should not be able to set owner as a non-existent user");
}
catch (NoSuchPersonException nspe)
{
// ignore
}
} }
public void testContainer() public void testContainer()
{ {
authenticationService.authenticate(USER_ANDY, USER_ANDY.toCharArray()); authenticationService.authenticate("andy", "andy".toCharArray());
NodeRef testNode = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_PERSON, ContentModel.TYPE_CONTAINER, null).getChildRef(); NodeRef testNode = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_PERSON, ContentModel.TYPE_CONTAINER, null).getChildRef();
assertNull(ownableService.getOwner(testNode)); assertNull(ownableService.getOwner(testNode));
assertFalse(ownableService.hasOwner(testNode)); assertFalse(ownableService.hasOwner(testNode));
assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE)); assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE));
assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE)); assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE));
assertFalse(dynamicAuthority.hasAuthority(testNode, USER_ANDY)); assertFalse(dynamicAuthority.hasAuthority(testNode, "andy"));
assertFalse(permissionService.hasPermission(testNode, PermissionService.READ) == AccessStatus.ALLOWED); assertFalse(permissionService.hasPermission(testNode, PermissionService.READ) == AccessStatus.ALLOWED);
assertFalse(permissionService.hasPermission(testNode, permissionService.getAllPermission()) == AccessStatus.ALLOWED); assertFalse(permissionService.hasPermission(testNode, permissionService.getAllPermission()) == AccessStatus.ALLOWED);
permissionService.setPermission(rootNodeRef, permissionService.getOwnerAuthority(), permissionService.getAllPermission(), true); permissionService.setPermission(rootNodeRef, permissionService.getOwnerAuthority(), permissionService.getAllPermission(), true);
ownableService.setOwner(testNode, USER_MUPPET); ownableService.setOwner(testNode, "muppet");
assertEquals(USER_MUPPET, ownableService.getOwner(testNode)); assertEquals("muppet", ownableService.getOwner(testNode));
ownableService.takeOwnership(testNode); ownableService.takeOwnership(testNode);
assertEquals(USER_ANDY, ownableService.getOwner(testNode)); assertEquals("andy", ownableService.getOwner(testNode));
assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE)); assertFalse(nodeService.hasAspect(testNode, ContentModel.ASPECT_AUDITABLE));
assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE)); assertTrue(nodeService.hasAspect(testNode, ContentModel.ASPECT_OWNABLE));
assertTrue(dynamicAuthority.hasAuthority(testNode, USER_ANDY)); assertTrue(dynamicAuthority.hasAuthority(testNode, "andy"));
assertTrue(permissionService.hasPermission(testNode, PermissionService.READ) == AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(testNode, PermissionService.READ) == AccessStatus.ALLOWED);
assertTrue(permissionService.hasPermission(testNode, permissionService.getAllPermission())== AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(testNode, permissionService.getAllPermission())== AccessStatus.ALLOWED);