From 270c07514d59955b67e16f03cda1bf0e22efcab3 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Fri, 12 Apr 2019 15:41:21 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/data-access/storagehub-webapp/1.0@179021 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/data/access/storagehub/AuthorizationChecker.java | 2 +- .../org/gcube/data/access/storagehub/services/GroupManager.java | 2 +- src/main/webapp/WEB-INF/README | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/data/access/storagehub/AuthorizationChecker.java b/src/main/java/org/gcube/data/access/storagehub/AuthorizationChecker.java index a503f6e..ca235c8 100644 --- a/src/main/java/org/gcube/data/access/storagehub/AuthorizationChecker.java +++ b/src/main/java/org/gcube/data/access/storagehub/AuthorizationChecker.java @@ -47,7 +47,7 @@ public class AuthorizationChecker { AccessControlEntry[] entries = accessControlList.getAccessControlEntries(); for (AccessControlEntry entry: entries) { - Authorizable authorizable = ((JackrabbitSession) session).getUserManager().getAuthorizable(id); + Authorizable authorizable = ((JackrabbitSession) session).getUserManager().getAuthorizable(entry.getPrincipal()); if (!authorizable.isGroup() && entry.getPrincipal().getName().equals(login)) return; if (authorizable.isGroup() && ((Group) authorizable).isMember(entry.getPrincipal())) return; } diff --git a/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java b/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java index ce423de..2aee1c8 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/GroupManager.java @@ -103,7 +103,7 @@ public class GroupManager { Group createdGroup = usrManager.createGroup(group); groupId = createdGroup.getID(); - createVreFolder(groupId, session, accessType); + createVreFolder(groupId, session, accessType!=null?accessType:AccessType.WRITE_OWNER); session.save(); }catch(Exception e) { diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README index c6e8c12..a32cb8e 100644 --- a/src/main/webapp/WEB-INF/README +++ b/src/main/webapp/WEB-INF/README @@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024), AGINFRA PLUS (grant no. 731001). Version -------------------------------------------------- -1.0.5-SNAPSHOT (2019-04-11) +1.0.5-SNAPSHOT (2019-04-12) Please see the file named "changelog.xml" in this directory for the release notes.