From a0bdb375c8037cb22c7eab17b0240130380eea35 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 7 Sep 2022 16:30:14 +0200 Subject: [PATCH] dbeaver/dbeaver-ee#1905 Remote config controller --- .../src/io/cloudbeaver/DBWConstants.java | 3 ++- .../src/io/cloudbeaver/model/app/WebApplication.java | 5 +++-- .../src/io/cloudbeaver/server/CBApplication.java | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java index 747f03b3db..9dfeda52b3 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java @@ -22,9 +22,10 @@ package io.cloudbeaver; public class DBWConstants { public static final String PERMISSION_PUBLIC = "public"; - public static final String PERMISSION_ADMIN = "admin"; + public static final String PERMISSION_CONFIGURATION_MANAGER = "configuration-manager"; + public static final String PERMISSION_EDIT_STRUCTURE = "edit-meta"; public static final String PERMISSION_EDIT_DATA = "edit-data"; diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java index 7788a34a03..43a6ba8e53 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java @@ -17,7 +17,7 @@ package io.cloudbeaver.model.app; import io.cloudbeaver.DataSourceFilter; -import io.cloudbeaver.model.session.WebSession; +import io.cloudbeaver.VirtualProjectImpl; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.app.DBPApplication; @@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.rm.RMController; import org.jkiss.dbeaver.model.rm.RMProject; import org.jkiss.dbeaver.model.security.SMAdminController; import org.jkiss.dbeaver.model.security.SMController; -import io.cloudbeaver.VirtualProjectImpl; import java.nio.file.Path; @@ -41,6 +40,8 @@ public interface WebApplication extends DBPApplication { Path getDataDirectory(boolean create); + Path getWorkspaceDirectory(); + Path getHomeDirectory(); boolean isMultiNode(); diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java index 63e88d14a1..6b3c84d8c6 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java @@ -456,6 +456,11 @@ public class CBApplication extends BaseWebApplication implements WebAuthApplicat return dataDir.toPath(); } + @Override + public Path getWorkspaceDirectory() { + return Path.of(workspaceLocation); + } + private void initializeSecurityController() throws DBException { securityController = createGlobalSecurityController(); }