inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AR-377 - able to export everything regardless of permissions (run in background = false).

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-01-31 13:06:04 +00:00
parent 43833a3d46
commit 89abae6099
3 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config/alfresco/core-services-context.xml
View File

@@ -631,17 +631,11 @@
<bean id="importerComponent" class="org.alfresco.repo.importer.ImporterComponent"> <bean id="importerComponent" class="org.alfresco.repo.importer.ImporterComponent">
<!-- For now, hard-wire the view parser --> <!-- For now, hard-wire the view parser -->
<property name="viewParser">
<ref bean="viewParser" />
</property>
<property name="namespaceService"> <property name="namespaceService">
<ref bean="namespaceService" /> <ref bean="NamespaceService" />
</property> </property>
<property name="dictionaryService"> <property name="dictionaryService">
<ref bean="dictionaryService" /> <ref bean="DictionaryService" />
</property>
<property name="behaviourFilter">
<ref bean="policyBehaviourFilter" />
</property> </property>
<property name="nodeService"> <property name="nodeService">
<ref bean="NodeService" /> <ref bean="NodeService" />
@@ -653,10 +647,22 @@
<ref bean="ContentService" /> <ref bean="ContentService" />
</property> </property>
<property name="ruleService"> <property name="ruleService">
<ref bean="ruleService" /> <ref bean="RuleService" />
</property> </property>
<property name="permissionService"> <property name="permissionService">
<ref bean="permissionService" /> <ref bean="PermissionService" />
</property>
<property name="authorityService">
<ref bean="AuthorityService" />
</property>
<property name="viewParser">
<ref bean="viewParser" />
</property>
<property name="behaviourFilter">
<ref bean="policyBehaviourFilter" />
</property>
<property name="ownableService">
<ref bean="ownableService" />
</property> </property>
</bean> </bean>
@@ -828,28 +834,28 @@
<!-- Exporter --> <!-- Exporter -->
<bean id="exporterComponent" class="org.alfresco.repo.exporter.ExporterComponent"> <bean id="exporterComponent" class="org.alfresco.repo.exporter.ExporterComponent">
<property name="namespaceService"> <property name="namespaceService">
<ref bean="namespaceService" /> <ref bean="NamespaceService" />
</property> </property>
<property name="dictionaryService"> <property name="dictionaryService">
<ref bean="dictionaryService" /> <ref bean="DictionaryService" />
</property> </property>
<property name="nodeService"> <property name="nodeService">
<ref bean="nodeService" /> <ref bean="NodeService" />
</property> </property>
<property name="searchService"> <property name="searchService">
<ref bean="searchService" /> <ref bean="SearchService" />
</property> </property>
<property name="contentService"> <property name="contentService">
<ref bean="contentService" /> <ref bean="ContentService" />
</property> </property>
<property name="descriptorService"> <property name="descriptorService">
<ref bean="DescriptorService" /> <ref bean="DescriptorService" />
</property> </property>
<property name="authenticationService"> <property name="authenticationService">
<ref bean="authenticationService" /> <ref bean="AuthenticationService" />
</property> </property>
<property name="permissionService"> <property name="permissionService">
<ref bean="permissionService" /> <ref bean="PermissionService" />
</property> </property>
</bean> </bean>

19
source/java/org/alfresco/repo/exporter/ExporterComponent.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.view.ExportPackageHandler; import org.alfresco.service.cmr.view.ExportPackageHandler;
import org.alfresco.service.cmr.view.Exporter; import org.alfresco.service.cmr.view.Exporter;
import org.alfresco.service.cmr.view.ExporterContext; import org.alfresco.service.cmr.view.ExporterContext;
@@ -333,16 +334,20 @@ public class ExporterComponent
exporter.endAspects(nodeRef); exporter.endAspects(nodeRef);
// Export node permissions // Export node permissions
Set<AccessPermission> permissions = permissionService.getAllSetPermissions(nodeRef); AccessStatus readPermission = permissionService.hasPermission(nodeRef, PermissionService.READ_PERMISSIONS);
boolean inheritPermissions = permissionService.getInheritParentPermissions(nodeRef); if (readPermission.equals(AccessStatus.ALLOWED))
if (permissions.size() > 0 || !inheritPermissions)
{ {
exporter.startACL(nodeRef); Set<AccessPermission> permissions = permissionService.getAllSetPermissions(nodeRef);
for (AccessPermission permission : permissions) boolean inheritPermissions = permissionService.getInheritParentPermissions(nodeRef);
if (permissions.size() > 0 || !inheritPermissions)
{ {
exporter.permission(nodeRef, permission); exporter.startACL(nodeRef);
for (AccessPermission permission : permissions)
{
exporter.permission(nodeRef, permission);
}
exporter.endACL(nodeRef);
} }
exporter.endACL(nodeRef);
} }
// Export node properties // Export node properties

71
source/java/org/alfresco/repo/importer/ImporterComponent.java
View File

@@ -53,6 +53,8 @@ import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.AuthorityService;
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.cmr.view.ImportPackageHandler; import org.alfresco.service.cmr.view.ImportPackageHandler;
import org.alfresco.service.cmr.view.ImporterBinding; import org.alfresco.service.cmr.view.ImporterBinding;
@@ -92,6 +94,8 @@ public class ImporterComponent
private ContentService contentService; private ContentService contentService;
private RuleService ruleService; private RuleService ruleService;
private PermissionService permissionService; private PermissionService permissionService;
private AuthorityService authorityService;
private OwnableService ownableService;
// binding markers // binding markers
private static final String START_BINDING_MARKER = "${"; private static final String START_BINDING_MARKER = "${";
@@ -172,7 +176,23 @@ public class ImporterComponent
this.permissionService = permissionService; this.permissionService = permissionService;
} }
/**
* @param authorityService authorityService
*/
public void setAuthorityService(AuthorityService authorityService)
{
this.authorityService = authorityService;
}
/**
* @param ownableService ownableService
*/
public void setOwnableService(OwnableService ownableService)
{
this.ownableService = ownableService;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.service.cmr.view.ImporterService#importView(java.io.InputStreamReader, org.alfresco.service.cmr.view.Location, java.util.Properties, org.alfresco.service.cmr.view.ImporterProgress) * @see org.alfresco.service.cmr.view.ImporterService#importView(java.io.InputStreamReader, org.alfresco.service.cmr.view.Location, java.util.Properties, org.alfresco.service.cmr.view.ImporterProgress)
*/ */
@@ -1031,7 +1051,7 @@ public class ImporterComponent
*/ */
private void reportPropertySet(NodeRef nodeRef, Map<QName, Serializable> properties) private void reportPropertySet(NodeRef nodeRef, Map<QName, Serializable> properties)
{ {
if (progress != null) if (progress != null && properties != null)
{ {
for (QName property : properties.keySet()) for (QName property : properties.keySet())
{ {
@@ -1048,7 +1068,7 @@ public class ImporterComponent
*/ */
private void reportPermissionSet(NodeRef nodeRef, List<AccessPermission> permissions) private void reportPermissionSet(NodeRef nodeRef, List<AccessPermission> permissions)
{ {
if (progress != null) if (progress != null && permissions != null)
{ {
for (AccessPermission permission : permissions) for (AccessPermission permission : permissions)
{ {
@@ -1115,16 +1135,28 @@ public class ImporterComponent
ChildAssociationRef assocRef = nodeService.createNode(parentRef, assocType, childQName, nodeType.getName(), initialProperties); ChildAssociationRef assocRef = nodeService.createNode(parentRef, assocType, childQName, nodeType.getName(), initialProperties);
NodeRef nodeRef = assocRef.getChildRef(); NodeRef nodeRef = assocRef.getChildRef();
// Apply permissions // Note: non-admin authorities take ownership of new nodes
boolean inheritPermissions = node.getInheritPermissions(); if (!authorityService.hasAdminAuthority())
if (!inheritPermissions)
{ {
permissionService.setInheritParentPermissions(nodeRef, false); ownableService.takeOwnership(nodeRef);
} }
List<AccessPermission> permissions = node.getAccessControlEntries();
for (AccessPermission permission : permissions) // apply permissions
List<AccessPermission> permissions = null;
AccessStatus writePermission = permissionService.hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS);
if (writePermission.equals(AccessStatus.ALLOWED))
{ {
permissionService.setPermission(nodeRef, permission.getAuthority(), permission.getPermission(), permission.getAccessStatus().equals(AccessStatus.ALLOWED)); permissions = node.getAccessControlEntries();
for (AccessPermission permission : permissions)
{
permissionService.setPermission(nodeRef, permission.getAuthority(), permission.getPermission(), permission.getAccessStatus().equals(AccessStatus.ALLOWED));
}
// note: apply inheritance after setting permissions as this may affect whether you can apply permissions
boolean inheritPermissions = node.getInheritPermissions();
if (!inheritPermissions)
{
permissionService.setInheritParentPermissions(nodeRef, false);
}
} }
// Disable behaviour for the node until the complete node (and its children have been imported) // Disable behaviour for the node until the complete node (and its children have been imported)
@@ -1290,15 +1322,20 @@ public class ImporterComponent
} }
// Apply permissions // Apply permissions
boolean inheritPermissions = node.getInheritPermissions(); List<AccessPermission> permissions = null;
if (!inheritPermissions) AccessStatus writePermission = permissionService.hasPermission(existingNodeRef, PermissionService.CHANGE_PERMISSIONS);
if (writePermission.equals(AccessStatus.ALLOWED))
{ {
permissionService.setInheritParentPermissions(existingNodeRef, false); boolean inheritPermissions = node.getInheritPermissions();
} if (!inheritPermissions)
List<AccessPermission> permissions = node.getAccessControlEntries(); {
for (AccessPermission permission : permissions) permissionService.setInheritParentPermissions(existingNodeRef, false);
{ }
permissionService.setPermission(existingNodeRef, permission.getAuthority(), permission.getPermission(), permission.getAccessStatus().equals(AccessStatus.ALLOWED)); permissions = node.getAccessControlEntries();
for (AccessPermission permission : permissions)
{
permissionService.setPermission(existingNodeRef, permission.getAuthority(), permission.getPermission(), permission.getAccessStatus().equals(AccessStatus.ALLOWED));
}
} }
// report update // report update