From c93b3304c21ca82aa61e5032d963e2cc3e11360d Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 13 May 2020 17:14:09 +0300 Subject: [PATCH] CB-65 Allow anonymous access to session state (permissions, sessionUser, close/touch session) --- .../io/cloudbeaver/service/core/DBWServiceCore.java | 10 ++++------ .../io/cloudbeaver/service/auth/DBWServiceAuth.java | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java index 49f6b941cc..ffd970601d 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java @@ -21,11 +21,9 @@ import io.cloudbeaver.DBWebException; import io.cloudbeaver.WebAction; import io.cloudbeaver.model.*; import io.cloudbeaver.model.session.WebSession; -import org.jkiss.dbeaver.model.exec.DBCException; import javax.servlet.http.HttpServletRequest; import java.util.List; -import java.util.Set; /** * Web service API @@ -41,7 +39,7 @@ public interface DBWServiceCore extends DBWService { @WebAction List getGlobalDataSources() throws DBWebException; - @WebAction + @WebAction(requirePermissions = {}) String[] getSessionPermissions(WebSession webSession) throws DBWebException; /////////////////////////////////////////// @@ -50,16 +48,16 @@ public interface DBWServiceCore extends DBWService { @WebAction(requirePermissions = {}) WebSession openSession(WebSession webSession) throws DBWebException; - @WebAction + @WebAction(requirePermissions = {}) WebSession getSessionState(WebSession webSession) throws DBWebException; @WebAction List readSessionLog(WebSession webSession, Integer maxEntries, Boolean clearEntries) throws DBWebException; - @WebAction + @WebAction(requirePermissions = {}) boolean closeSession(HttpServletRequest request) throws DBWebException; - @WebAction + @WebAction(requirePermissions = {}) boolean touchSession(HttpServletRequest request) throws DBWebException; @WebAction diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java index 35e41da1aa..9b46cf4281 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java @@ -34,6 +34,6 @@ public interface DBWServiceAuth extends DBWService { @WebAction() void authLogout(WebSession webSession) throws DBWebException; - @WebAction() + @WebAction(requirePermissions = {}) WebAuthInfo sessionUser(WebSession webSession) throws DBWebException; }