mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,107 +1,107 @@
|
||||
package org.alfresco.repo.security.person;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
||||
import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
/**
|
||||
* Check and fix permission for people. For each person check the permission config matches that configured for the
|
||||
* person service.
|
||||
*
|
||||
* @author andyh
|
||||
*/
|
||||
public class CheckAndFixPersonPermissionsBootstrapBean extends AbstractLifecycleBean
|
||||
{
|
||||
protected final static Log log = LogFactory.getLog(CheckAndFixPersonPermissionsBootstrapBean.class);
|
||||
|
||||
private NodeService nodeService;
|
||||
|
||||
private PersonService personService;
|
||||
|
||||
private TransactionService transactionService;
|
||||
|
||||
private PermissionsManager permissionsManager;
|
||||
|
||||
private Set<String> excludedUsers;
|
||||
|
||||
public void setNodeService(NodeService nodeService)
|
||||
{
|
||||
this.nodeService = nodeService;
|
||||
}
|
||||
|
||||
public void setPersonService(PersonService personService)
|
||||
{
|
||||
this.personService = personService;
|
||||
}
|
||||
|
||||
public void setTransactionService(TransactionService transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
public void setPermissionsManager(PermissionsManager permissionsManager)
|
||||
{
|
||||
this.permissionsManager = permissionsManager;
|
||||
}
|
||||
|
||||
public void setExcludedUsers(Set<String> excludedUsers)
|
||||
{
|
||||
this.excludedUsers = excludedUsers;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onBootstrap(ApplicationEvent event)
|
||||
{
|
||||
log.info("Checking person permissions ...");
|
||||
int count = checkandFixPermissions();
|
||||
log.info("... updated " + count);
|
||||
}
|
||||
|
||||
private int checkandFixPermissions()
|
||||
{
|
||||
Integer count = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Integer>()
|
||||
{
|
||||
public Integer execute() throws Exception
|
||||
{
|
||||
int count = 0;
|
||||
|
||||
Set<NodeRef> people = personService.getAllPeople();
|
||||
for (NodeRef person : people)
|
||||
{
|
||||
String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(person, ContentModel.PROP_USERNAME));
|
||||
if((excludedUsers != null) && excludedUsers.contains(uid))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if(!permissionsManager.validatePermissions(person, uid, uid))
|
||||
{
|
||||
permissionsManager.setPermissions(person, uid, uid);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
});
|
||||
return count.intValue();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onShutdown(ApplicationEvent event)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
package org.alfresco.repo.security.person;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
||||
import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
|
||||
/**
|
||||
* Check and fix permission for people. For each person check the permission config matches that configured for the
|
||||
* person service.
|
||||
*
|
||||
* @author andyh
|
||||
*/
|
||||
public class CheckAndFixPersonPermissionsBootstrapBean extends AbstractLifecycleBean
|
||||
{
|
||||
protected final static Log log = LogFactory.getLog(CheckAndFixPersonPermissionsBootstrapBean.class);
|
||||
|
||||
private NodeService nodeService;
|
||||
|
||||
private PersonService personService;
|
||||
|
||||
private TransactionService transactionService;
|
||||
|
||||
private PermissionsManager permissionsManager;
|
||||
|
||||
private Set<String> excludedUsers;
|
||||
|
||||
public void setNodeService(NodeService nodeService)
|
||||
{
|
||||
this.nodeService = nodeService;
|
||||
}
|
||||
|
||||
public void setPersonService(PersonService personService)
|
||||
{
|
||||
this.personService = personService;
|
||||
}
|
||||
|
||||
public void setTransactionService(TransactionService transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
public void setPermissionsManager(PermissionsManager permissionsManager)
|
||||
{
|
||||
this.permissionsManager = permissionsManager;
|
||||
}
|
||||
|
||||
public void setExcludedUsers(Set<String> excludedUsers)
|
||||
{
|
||||
this.excludedUsers = excludedUsers;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onBootstrap(ApplicationEvent event)
|
||||
{
|
||||
log.info("Checking person permissions ...");
|
||||
int count = checkandFixPermissions();
|
||||
log.info("... updated " + count);
|
||||
}
|
||||
|
||||
private int checkandFixPermissions()
|
||||
{
|
||||
Integer count = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Integer>()
|
||||
{
|
||||
public Integer execute() throws Exception
|
||||
{
|
||||
int count = 0;
|
||||
|
||||
Set<NodeRef> people = personService.getAllPeople();
|
||||
for (NodeRef person : people)
|
||||
{
|
||||
String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(person, ContentModel.PROP_USERNAME));
|
||||
if((excludedUsers != null) && excludedUsers.contains(uid))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if(!permissionsManager.validatePermissions(person, uid, uid))
|
||||
{
|
||||
permissionsManager.setPermissions(person, uid, uid);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
});
|
||||
return count.intValue();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onShutdown(ApplicationEvent event)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user