diff --git a/server/bundles/io.cloudbeaver.model/plugin.xml b/server/bundles/io.cloudbeaver.model/plugin.xml index de60a463385..f3c606fd062 100644 --- a/server/bundles/io.cloudbeaver.model/plugin.xml +++ b/server/bundles/io.cloudbeaver.model/plugin.xml @@ -25,6 +25,11 @@ label="Default secret controller" description="Default void secret controller"/> + + + + + diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java index 0905de50a9e..4a6545dac3e 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2024 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package io.cloudbeaver.model.session; import io.cloudbeaver.WebSessionProjectImpl; +import io.cloudbeaver.utils.ServletAppUtils; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.DBException; @@ -199,12 +200,15 @@ void clearProjects() { @Override public boolean hasRealmPermission(@NotNull String permission) { + if (getWebSession() instanceof WebSession webSession) { + return webSession.getSessionPermissions().contains(permission); + } return false; } @Override public boolean supportsRealmFeature(@NotNull String feature) { - return false; + return ServletAppUtils.getServletApplication().getAppConfiguration().isFeatureEnabled(feature); } } diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspace.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspace.java index faa896cfe83..07382c5b674 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspace.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/ServerGlobalWorkspace.java @@ -115,4 +115,9 @@ public BaseProjectImpl getProject(@NotNull String projectName) { } return null; } + + @Override + public boolean supportsRealmFeature(@NotNull String feature) { + return application.getAppConfiguration().isFeatureEnabled(feature); + } } \ No newline at end of file