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

CLOUD-2230: Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD:

Browse Source 
57950: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
        57946: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
           57944: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
              57942: MNT-9987: Merged V4.1.3 (4.1.3.17) to V4.1.7 (4.1.7)
                 57555: MNT-9849 : Files cannot be deleted over WebDAV with HF 4.1.3.16
                  Was added check for delete permission in webdav/DeleteMethod.
                 57686: MNT-9849 : Files cannot be deleted over WebDAV with HF 4.1.3.16
                    - Catch exceptions that might be thrown in TimerTask and causing the Timer to no longer accept tasks to be scheduled.
                    - Tidy up some variable names



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2013-12-11 14:08:08 +00:00
parent 4f17f8504e
commit 7dd4868a88
1 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
source/java/org/alfresco/repo/webdav/DeleteMethod.java
View File

@@ -34,6 +34,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.webdav.WebDavService; import org.alfresco.service.cmr.webdav.WebDavService;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.util.FileFilterMode; import org.alfresco.util.FileFilterMode;
/** /**
@@ -73,10 +75,11 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
} }
/** /**
* @deprecated Hack for MNT-8704: WebDAV:Content does not disappear after being deleted * @deprecated MNT-8704: WebDAV:Content does not disappear after being deleted
*/ */
@Deprecated @Deprecated
private static final Timer deleteHackTimer = new Timer(); private static final Timer deleteDelayTimer = new Timer();
/** /**
* Execute the request * Execute the request
* *
@@ -90,6 +93,7 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
} }
final FileFolderService fileFolderService = getFileFolderService(); final FileFolderService fileFolderService = getFileFolderService();
final PermissionService permissionService = getPermissionService();
NodeRef rootNodeRef = getRootNodeRef(); NodeRef rootNodeRef = getRootNodeRef();
@@ -114,73 +118,91 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
final NodeService nodeService = getNodeService(); final NodeService nodeService = getNodeService();
final NodeRef nodeRef = fileInfo.getNodeRef(); final NodeRef nodeRef = fileInfo.getNodeRef();
// As this content will be deleted, we need to extract some info before it's no longer available.
String siteId = getSiteId();
NodeRef deletedNodeRef = fileInfo.getNodeRef();
FileInfo parentFile = getDAVHelper().getParentNodeForPath(getRootNodeRef(), path);
// Don't post activity data for hidden files, resource forks etc. if (permissionService.hasPermission(nodeRef, PermissionService.DELETE) == AccessStatus.ALLOWED)
if (!getDAVHelper().isRenameShuffle(path))
{ {
postActivity(parentFile, fileInfo, siteId); // As this content will be deleted, we need to extract some info before it's no longer available.
} String siteId = getSiteId();
NodeRef deletedNodeRef = fileInfo.getNodeRef();
FileInfo parentFile = getDAVHelper().getParentNodeForPath(getRootNodeRef(), path);
// MNT-181: working copies and versioned nodes are hidden rather than deleted // Don't post activity data for hidden files, resource forks etc.
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) || nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) if (!getDAVHelper().isRenameShuffle(path))
{ {
// Mark content as hidden. This breaks many contracts and will be fixed for "ALF-18619 WebDAV/SPP file shuffles" postActivity(parentFile, fileInfo, siteId);
fileFolderService.setHidden(nodeRef, true); }
// MNT-181: working copies and versioned nodes are hidden rather than deleted
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) || nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
{ {
// Workaround for MNT-8704: WebDAV:Content does not disappear after being deleted // Mark content as hidden. This breaks many contracts and will be fixed for "ALF-18619 WebDAV/SPP file shuffles"
// Get the current user fileFolderService.setHidden(nodeRef, true);
final String deleteHackUser = AuthenticationUtil.getFullyAuthenticatedUser();
// Add a timed task to really delete the file
TimerTask deleteHackTask = new TimerTask()
{ {
@Override // Workaround for MNT-8704: WebDAV:Content does not disappear after being deleted
public void run() // Get the current user
final String deleteDelayUser = AuthenticationUtil.getFullyAuthenticatedUser();
// Add a timed task to really delete the file
TimerTask deleteDelayTask = new TimerTask()
{ {
RunAsWork<Void> deleteHackRunAs = new RunAsWork<Void>() @Override
public void run()
{ {
@Override RunAsWork<Void> deleteDelayRunAs = new RunAsWork<Void>()
public Void doWork() throws Exception
{ {
// Ignore if it is NOT hidden: the shuffle may have finished; the operation may have failed @Override
if (!nodeService.exists(nodeRef) || !fileFolderService.isHidden(nodeRef)) public Void doWork() throws Exception
{ {
// Ignore if it is NOT hidden: the shuffle may have finished; the operation may have failed
if (!nodeService.exists(nodeRef) || !fileFolderService.isHidden(nodeRef))
{
return null;
}
// Since this will run in a different thread, the client thread-local must be set
// or else unhiding the node will not unhide it for WebDAV.
FileFilterMode.setClient(FileFilterMode.Client.webdav);
// Unhide the node, e.g. for archiving
fileFolderService.setHidden(nodeRef, false);
// This is the transaction-aware service
fileFolderService.delete(nodeRef);
return null; return null;
} }
};
// Since this will run in a different thread, the client thread-local must be set try
// or else unhiding the node will not unhide it for WebDAV. {
FileFilterMode.setClient(FileFilterMode.Client.webdav); AuthenticationUtil.runAs(deleteDelayRunAs, deleteDelayUser);
// Unhide the node, e.g. for archiving
fileFolderService.setHidden(nodeRef, false);
// This is the transaction-aware service
fileFolderService.delete(nodeRef);
return null;
} }
}; catch (Throwable e)
AuthenticationUtil.runAs(deleteHackRunAs, deleteHackUser); {
} // consume exception to avoid it leaking from the TimerTask and causing the Timer to
}; // no longer accept tasks to be scheduled.
// Schedule a real delete 5 seconds after the current time logger.info("Exception thrown during WebDAV delete timer task.", e);
deleteHackTimer.schedule(deleteHackTask, 5000L); }
}
};
// Schedule a real delete 5 seconds after the current time
deleteDelayTimer.schedule(deleteDelayTask, 5000L);
}
getDAVLockService().unlock(nodeRef);
}
// We just ensure already-hidden nodes are left unlocked
else if (fileFolderService.isHidden(nodeRef))
{
getDAVLockService().unlock(nodeRef);
}
// A 'real' delete
else
{
// Delete it
fileFolderService.delete(deletedNodeRef);
} }
getDAVLockService().unlock(nodeRef);
} }
// We just ensure already-hidden nodes are left unlocked
else if (fileFolderService.isHidden(nodeRef))
{
getDAVLockService().unlock(nodeRef);
}
// A 'real' delete
else else
{ {
// Delete it // access denied
fileFolderService.delete(deletedNodeRef); throw new WebDAVServerException(HttpServletResponse.SC_FORBIDDEN);
} }
} }