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

MNT-21883 - Fix unshare content from smart folder (#765)

Browse Source
This commit is contained in:
Aleksandra Onych
2021-10-25 10:28:36 +02:00
committed by GitHub
parent 1b0ddb1e74
commit 142f99b2a2
2 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java
View File

@@ -31,10 +31,12 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.QuickShareModel; import org.alfresco.model.QuickShareModel;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.service.cmr.quickshare.InvalidSharedIdException; import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
@@ -82,14 +84,15 @@ public class UnshareContentDelete extends AbstractQuickShareContent
try try
{ {
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond(); Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
String networkTenantDomain = pair.getFirst();
String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY); TenantUtil.runAsSystemTenant(() ->
if (!quickShareService.canDeleteSharedLink(nodeRef, sharedBy))
{ {
throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Can't perform unshare action: " + sharedId); checkIfCanDeleteSharedLink(sharedId);
} quickShareService.unshareContent(sharedId);
quickShareService.unshareContent(sharedId); return null;
}, networkTenantDomain);
Map<String, Object> model = new HashMap<>(1); Map<String, Object> model = new HashMap<>(1);
model.put("success", Boolean.TRUE); model.put("success", Boolean.TRUE);
@@ -106,4 +109,14 @@ public class UnshareContentDelete extends AbstractQuickShareContent
throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: " + sharedId); throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: " + sharedId);
} }
} }
private void checkIfCanDeleteSharedLink(String sharedId) {
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
if (!quickShareService.canDeleteSharedLink(nodeRef, sharedBy))
{
throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Can't perform unshare action: " + sharedId);
}
}
} }

24
remote-api/src/main/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
View File

@@ -274,15 +274,15 @@ public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExt
try try
{ {
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond(); Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
String networkTenantDomain = pair.getFirst();
String sharedByUserId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY); TenantUtil.runAsSystemTenant(() ->
if (!quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
{ {
throw new PermissionDeniedException("Can't perform unshare action: " + sharedId); checkIfCanDeleteSharedLink(sharedId);
} quickShareService.unshareContent(sharedId);
return null;
quickShareService.unshareContent(sharedId); }, networkTenantDomain);
} }
catch (InvalidSharedIdException ex) catch (InvalidSharedIdException ex)
{ {
@@ -698,4 +698,14 @@ public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExt
throw new InvalidArgumentException("A valid recipientEmail must be specified."); throw new InvalidArgumentException("A valid recipientEmail must be specified.");
} }
} }
private void checkIfCanDeleteSharedLink(String sharedId) {
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
String sharedByUserId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
if (!quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
{
throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
}
}
} }