gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chagend validateACLToUser to check parent permission 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@113605 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-03-13 16:06:15 +00:00
parent 2733ce7e22
commit 72afddcfb1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -2998,6 +2998,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
Workspace workspace = getWorkspace();
WorkspaceFolder folder = (WorkspaceFolder) workspace.getItem(folderId);
if(!folder.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ //IS NOT ROOT SHARED FOLDER?
WorkspaceFolder parent = folder.getParent();
if(parent!=null)
folder = parent;
else
workspaceLogger.warn("Parent folder of folder: "+folder.getName() + " is null, using current folder");
}
Map<ACLType, List<String>> mapACL = folder.getACLOwner();
ACLType settingACL = ACLType.valueOf(aclType);
@ -3035,7 +3042,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
//CHANGE ACL IS NOT VALID
workspaceLogger.trace("Reject ACL: "+settingACL+ " to "+username);
validLogins.remove(username);
errors.add("Unable to grant the privilege "+settingACL+" for "+fullname+", it's lower than (already assigned) "+ aclHL);
errors.add("Unable to grant the privilege "+settingACL+" for "+fullname+", it's lower than (parent privilege) "+ aclHL);
break;
}else if(cmp==0){
//SAME ACL