diff --git a/distro/pom.xml b/distro/pom.xml new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index f3a6a34..474122e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ ${project.basedir}/src/main/webapp/WEB-INF - ${project.basedir}/distro 2.16.0 7.0.40 6.1.26 diff --git a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java index fddb7e1..4b59a63 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/UserManager.java @@ -27,11 +27,13 @@ import org.apache.jackrabbit.api.security.user.Query; import org.apache.jackrabbit.api.security.user.QueryBuilder; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.core.security.principal.PrincipalImpl; +import org.gcube.common.authorization.control.annotations.AuthorizationControl; import org.gcube.common.gxrest.response.outbound.GXOutboundErrorResponse; import org.gcube.common.storagehub.model.exceptions.BackendGenericError; import org.gcube.common.storagehub.model.types.NodeProperty; import org.gcube.data.access.storagehub.Constants; import org.gcube.data.access.storagehub.Utils; +import org.gcube.data.access.storagehub.exception.MyAuthException; import org.gcube.data.access.storagehub.handlers.CredentialHandler; import org.gcube.data.access.storagehub.handlers.UnshareHandler; import org.slf4j.Logger; @@ -53,7 +55,7 @@ public class UserManager { @GET @Path("") @Produces(MediaType.APPLICATION_JSON) - //@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) + @AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) public List getUsers(){ JackrabbitSession session = null; @@ -87,7 +89,7 @@ public class UserManager { @POST @Path("") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - //@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) + @AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) public String createUser(@FormParam("user") String user, @FormParam("password") String password){ JackrabbitSession session = null; @@ -125,7 +127,7 @@ public class UserManager { @DELETE @Path("{id}") - //@AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) + @AuthorizationControl(allowed={"lucio.lelii"}, exception=MyAuthException.class) public String deleteUser(@PathParam("id") String id){ JackrabbitSession session = null; diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml index 16a86ad..e69de29 100644 --- a/src/main/webapp/WEB-INF/gcube-app.xml +++ b/src/main/webapp/WEB-INF/gcube-app.xml @@ -1,14 +0,0 @@ - - StorageHub - DataAccess - 1.0.7-SNAPSHOT - Storage Hub webapp - - - - - - \ No newline at end of file