Cb 3960 migrate core blocks components to css modules (#2578)

* CB-3960 removes unused SlideBox styles

* CB-3960 makes menu panel reshadowless

* CB-3960 makes menu bar small item reshadowless

* CB-3960 removes reshadow from loaders

* fix: loader styles are the same as was

* fix: CB-3960 fix hidden actions in table footer

* fix: menu trigger

---------

Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>

.github/workflows/frontend.yml

@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "20"
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.gitignore

@@ -40,6 +40,7 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/
 .classpath
 .settings/
 
+workspace-dev-ce/
 deploy/cloudbeaver
 server/**/target
 apps/**/target

.vscode/launch.json

@@ -7,31 +7,25 @@
       "name": "Chrome",
       "url": "http://localhost:8080",
       "webRoot": "${workspaceFolder}/..",
+      "outFiles": [
+        "${workspaceFolder}/../cloudbeaver/packages/**/dist/**/*.{js,jsx}"
+      ],
+      "smartStep": true,
       "sourceMaps": true,
-      "sourceMapPathOverrides": {
-        "webpack:///*": "${workspaceFolder}/../*"
-      },
-      "skipFiles": [
-        "<node_internals>/**",
-        "**/node_modules/**",
-        "${workspaceFolder}/webapp/**/node_modules/**/*.js",
-        "${workspaceFolder}/webapp/**/dist/**/*.js"
-      ]
+      "disableNetworkCache": true,
+      "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
     },
     {
       "type": "java",
       "name": "CloudBeaver CE",
-      "cwd": "${workspaceFolder}/../opt/cbce",
+      "cwd": "${workspaceFolder}/workspace-dev-ce",
       "request": "launch",
-      "mainClass": "org.eclipse.equinox.launcher.Main",
+      "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
       "windows": {
         "type": "java",
         "name": "CloudBeaver CE",
         "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar"
-        ],
+        "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",
@@ -63,10 +57,7 @@
         "type": "java",
         "name": "CloudBeaver CE",
         "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar"
-        ],
+        "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",
@@ -81,8 +72,10 @@
           "-arch",
           "aarch64",
           "-nl",
-          "en_US",
-          "-showsplash"
+          "en",
+          "-showsplash",
+          "-web-config",
+          "conf/cloudbeaver.conf"
         ],
         "vmArgs": [
           "-XX:+IgnoreUnrecognizedVMOptions",

.vscode/license.code-snippets

@@ -1,17 +1,15 @@
 {
   "license": {
-    "scope": "typescript,typescriptreact,javascript,javascriptreact",
+    "scope": "typescript,typescriptreact,javascript,javascriptreact,css,scss",
     "prefix": "license",
     "body": [
       "/*",
       " * CloudBeaver - Cloud Database Manager",
-      " * Copyright (C) 2020-2023 DBeaver Corp and others",
+      " * Copyright (C) 2020-2024 DBeaver Corp and others",
       " *",
       " * Licensed under the Apache License, Version 2.0.",
       " * you may not use this file except in compliance with the License.",
-      " */",
-      "",
-      ""
+      " */"
     ]
   }
 }

.vscode/tasks.json

@@ -33,6 +33,35 @@
         "cwd": "${workspaceFolder}/webapp/packages/product-default"
       }
     },
+    {
+      "label": "Generate dev proprties for CBCE",
+      "type": "shell",
+      "command": "mvn",
+      "osx": {
+        "args": [
+          "package",
+          "-q",
+          "exec:java",
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
+        ]
+      },
+      "windows": {
+        "args": [
+          "package",
+          "-q",
+          "exec:java",
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
+        ]
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/../idea-rcp-launch-config-generator"
+      },
+      "presentation": {
+        "reveal": "silent",
+        "close": true,
+        "clear": false
+      }
+    },
     {
       "label": "Build CE",
       "type": "shell",
@@ -50,6 +79,19 @@
         "isDefault": true
       }
     },
+    {
+      "label": "Run Backend CE",
+      "type": "shell",
+      "windows": {
+        "command": "./run-server.bat"
+      },
+      "osx": {
+        "command": "./run-server.sh"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
+      }
+    },
     {
       "label": "Yarn Install",
       "type": "shell",
@@ -60,6 +102,14 @@
         "close": true,
         "clear": false
       }
+    },
+    {
+      "label": "Update TS references CE",
+      "type": "shell",
+      "command": "yarn lerna run update-ts-references --stream",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp"
+      }
     }
   ],
   "inputs": [

README.md

@@ -22,23 +22,57 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 
 ## Changelog
 
-### CloudBeaver 23.2.5 - 2023-11-20
-
-- Added the ability to count the total number of entries in the table;
-- Administrators have gained the ability to permanently delete users and their data;
-- Different bug fixes and enhancements have been made.
-
-
-### CloudBeaver 23.2.4 - 2023-11-06
-
+### 24.0.3. 2024-04-22
 - Unauthorized access vulnerability was fixed;
-- Updated the version of the Clickhouse driver to 0.4.6;
-- Support for using custom delimiters has been added in MySQL;
+- Added the ability for users to configure personal settings for the interface, SQL editor, and data viewer through the settings panel;
+- Added the ability to backup of the internal database before schema migration (for H2);
 - Different bug fixes and enhancements have been made.
 
+### 24.0.2. 2024-04-08
+- Added the ability to import data to the database from CSV file;
+- Implemented support for utilizing environment variables within connection configurations;
+- The ability to select a case for column names has been added to CSV export;
+- A new Apache Kyuubi driver has been added;
+- Trino driver has been updated to version 438;
+- Clickhouse driver has been updated to version 0.6.0-patch2;
+- Have enhanced security of H2 connection;
+- Different bug fixes and enhancements have been made.
 
+### 24.0.1. 2024-03-25
+- Added support for two modes for committing changes to the database:
+  - Auto-commit transfers all changes that you make immediately to the database;
+  - Manual commit requires your confirmation before committing a change to the database or rolling it back.
+- Different bug fixes and enhancements have been made.
+  
+### 24.0.0. 2024-03-04
+  - Changes since 23.3.0:
 
-### Old CloudBeaver releases
-
-You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
-
+- Main updates:
+  - Have enhanced security for unauthorised access;
+  - Have added a password policy for the local authorization. Password parameters can be set in the configuration file;
+  - Have added validation for mandatory fields in all forms to create and edit entities;
+  - Have added an ability to edit the default preferences of the following parts: interface, tools and data viewer in the settings panel in the administrative part;
+- Performance:
+  - Have improved the performance of the server.
+- Administration:
+  - Have added the ability to configure reverse proxy header name and redirect URL at logout. Now the administrator can configure all settings. The delimiter symbol for the reverse proxy team headers is configurable;
+- Preferences:
+  - Have added the ability in the admin panel to customise copying in the Tables and Values panel for all users except the administrator;
+  - Have added the ability to disable alias autocomplete for all users.
+- Access Management:
+  - A default user group was added to the product. This group includes all users which could not be deleted.
+- Connections:
+  - The 'Keep alive' option has been added to the connection settings to keep the connection active even in case of inactivity.
+- Data Editor: 
+  - Have added the ability to view decoded binary-type data in the Value panel;
+  - Text wrap is activated by default for texts and BLOBs in the Values panel for better visibility. The user can switch to the one-line mode using a button on the toolbar;
+  - Have added the ability to display full text for a string data type in the Value panel;
+  - Have added the ability to display the OpenStreetMap layer with the coordinate system ESPG 4326.
+- Resource management:
+  - Read-only scripts now have a padlock icon.
+- Databases:
+  - The DuckDB driver has been added;
+  - Updated PostgreSQL driver to 42.5.2;
+  - ClickHouse Legacy driver has been removed to prevent potential vulnerability issues;
+  - Updated MariaDB driver to version 3.3.2.
+- Different bug fixes and enhancements have been made.

apps/h2-query-executor/src/main/java/io/cloudbeaver/ArgsParser.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

apps/h2-query-executor/src/main/java/io/cloudbeaver/H2ExecutorConsoleApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

apps/h2-query-executor/src/main/java/io/cloudbeaver/H2QueryExecutor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

apps/h2-query-executor/src/main/java/io/cloudbeaver/SqlConsts.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

config/core/initial-data.conf

@@ -2,13 +2,13 @@
     teams: [
         {
             subjectId: "admin",
-            name: "Admin",
+            teamName: "Admin",
             description: "Administrative access. Has all permissions.",
             permissions: [ "admin" ]
         },
         {
             subjectId: "user",
-            name: "User",
+            teamName: "User",
             description: "All users, including anonymous.",
             permissions: [ ]
         }

config/core/product.conf

@@ -1,31 +0,0 @@
-// Product configuration. Customized web application behavior
-// It is in JSONC format
-{
-    // Global properties
-    core: {
-        // User defaults
-        user: {
-            defaultTheme: "light",
-            defaultLanguage: "en"
-        },
-        app: {
-            // Log viewer config
-            logViewer: {
-                refreshTimeout: 3000,
-                logBatchSize: 1000,
-                maxLogRecords: 2000,
-                maxFailedRequests: 3
-            }
-        }
-    },
-    // Notifications config
-    core_events: {
-        notificationsPool: 5
-    },
-    plugin_data_spreadsheet_new: {
-        hidden: false
-    },
-    plugin_data_export: {
-        disabled: false
-    }
-}

config/sample-databases/DefaultConfiguration/cloudbeaver.conf

@@ -11,7 +11,21 @@
         rootURI: "/",
         serviceURI: "/api/",
 
-        productConfiguration: "conf/product.conf",
+        productSettings: {
+            # Global properties
+            core.theming.theme: 'light',
+            core.localization.localization: 'en',
+            plugin.sql-editor.autoSave: true,
+            plugin.sql-editor.disabled: false,
+            # max size of the file that can be uploaded to the editor (in kilobytes)
+            plugin.sql-editor.maxFileSize: 10240,
+            plugin.log-viewer.disabled: false,
+            plugin.log-viewer.logBatchSize: 1000,
+            plugin.log-viewer.maxFailedRequests: 3,
+            plugin.log-viewer.maxLogRecords: 2000,
+            plugin.log-viewer.refreshTimeout: 3000,
+            sql.proposals.insert.table.alias: PLAIN
+        },
 
         expireSessionAfterPeriod: 1800000,
 
@@ -19,8 +33,21 @@
 
         enableSecurityManager: false,
 
+        sm: {
+            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
+            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
+            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
+            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
+            passwordPolicy: {
+                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
+                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
+                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
+                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
+            }
+        },
+
         database: {
-            driver="h2_embedded_v2",
+            driver: "h2_embedded_v2",
             url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
             initialDataConfiguration: "conf/initial-data.conf",
             pool: {
@@ -28,16 +55,19 @@
                 maxIdleConnections: 10,
                 maxConnections: 100,
                 validationQuery: "SELECT 1"
-            }
+            },
+            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
         }
 
     },
     app: {
         anonymousAccessEnabled: true,
         anonymousUserRole: "user",
+        defaultUserTeam: "user",
         grantConnectionsAccessToAnonymousTeam: false,
         supportsCustomConnections: false,
         showReadOnlyConnectionInfo: false,
+        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
 
         forwardProxy: false,
 

config/sample-databases/SQLiteConfiguration/cloudbeaver.conf

@@ -9,7 +9,21 @@
         rootURI: "/",
         serviceURI: "/api/",
 
-        productConfiguration: "conf/product.conf",
+        productSettings: {
+            # Global properties
+            core.theming.theme: 'light',
+            core.localization.localization: 'en',
+            plugin.sql-editor.autoSave: true,
+            plugin.sql-editor.disabled: false,
+            # max size of the file that can be uploaded to the editor (in kilobytes)
+            plugin.sql-editor.maxFileSize: 10240,
+            plugin.log-viewer.disabled: false,
+            plugin.log-viewer.logBatchSize: 1000,
+            plugin.log-viewer.maxFailedRequests: 3,
+            plugin.log-viewer.maxLogRecords: 2000,
+            plugin.log-viewer.refreshTimeout: 3000,
+            sql.proposals.insert.table.alias: PLAIN
+        },
 
         expireSessionAfterPeriod: 1800000,
 
@@ -18,7 +32,7 @@
         enableSecurityManager: false,
 
         database: {
-            driver="h2_embedded_v2",
+            driver:"h2_embedded_v2",
             url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
             initialDataConfiguration: "conf/initial-data.conf",
             pool: {
@@ -26,6 +40,19 @@
                 maxIdleConnections: 10,
                 maxConnections: 100,
                 validationQuery: "SELECT 1"
+            },
+            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
+        },
+        sm: {
+            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
+            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
+            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
+            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
+            passwordPolicy: {
+                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
+                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
+                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
+                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
             }
         }
 
@@ -36,6 +63,7 @@
         grantConnectionsAccessToAnonymousTeam: false,
         supportsCustomConnections: false,
         showReadOnlyConnectionInfo: false,
+        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
 
         forwardProxy: false,
 

deploy/build-backend.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+set -Eeo pipefail
+set +u
+
+# #command line arguments
+# CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
+# SAMPLE_DATABASE_PATH=${2-""}
+
+# echo $CONFIGURATION_PATH
+# echo $SAMPLE_DATABASE_PATH
+echo "Clone and build Cloudbeaver"
+
+rm -rf ./drivers
+rm -rf ./cloudbeaver
+mkdir ./cloudbeaver
+mkdir ./cloudbeaver/server
+mkdir ./cloudbeaver/conf
+mkdir ./cloudbeaver/workspace
+mkdir ./cloudbeaver/web
+
+echo "Pull cloudbeaver platform"
+
+cd ../..
+
+echo "Pull dbeaver platform"
+[ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
+[ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
+
+
+cd cloudbeaver/deploy
+
+echo "Build CloudBeaver server"
+
+cd ../server/product/aggregate
+mvn clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Could not perform package'; exit $rc
+fi
+cd ../../../deploy
+
+echo "Copy server packages"
+
+cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
+cp -p ./scripts/* ./cloudbeaver
+mkdir cloudbeaver/samples
+
+if [[ -z $SAMPLE_DATABASE_PATH  ]]; then
+  SAMPLE_DATABASE_PATH=""
+else
+  mkdir cloudbeaver/samples/db
+  cp -rp "${SAMPLE_DATABASE_PATH}" cloudbeaver/samples/
+fi
+
+if [[ -z "$CONFIGURATION_PATH" ]]; then
+  CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
+fi
+
+cp -rp  ../config/core/* cloudbeaver/conf
+cp -rp "${CONFIGURATION_PATH}"/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
+cp -p "${CONFIGURATION_PATH}"/*.conf cloudbeaver/conf/
+mv drivers cloudbeaver
+
+echo "End of backend build"

deploy/build-frontend.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+echo "Build static content"
+
+cd ../../cloudbeaver/webapp
+
+yarn
+yarn lerna run bootstrap
+yarn lerna run bundle --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Application build failed'; exit $rc
+fi
+
+cd ../deploy
+
+echo "Copy static content"
+
+cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
+
+echo "Cloudbeaver is ready. Run run-server.sh in cloudbeaver folder to start the server."

deploy/build-sqlite.sh

@@ -1 +1,9 @@
-./build.sh '../config/sample-databases/SQLiteConfiguration' '../config/sample-databases/db'
+#!/bin/bash
+set -Eeuo pipefail
+
+#command line arguments
+CONFIGURATION_PATH='../config/sample-databases/SQLiteConfiguration'
+SAMPLE_DATABASE_PATH='../config/sample-databases/db'
+
+source build-backend.sh 
+source build-frontend.sh

deploy/build.bat

@@ -24,6 +24,7 @@ cd ..\..
 echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
+IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server

deploy/build.sh

@@ -2,70 +2,8 @@
 set -Eeuo pipefail
 
 #command line arguments
-CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
-SAMPLE_DATABASE_PATH=${2-""}
+CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
+SAMPLE_DATABASE_PATH=""
 
-echo "Clone and build Cloudbeaver"
-
-rm -rf ./drivers
-rm -rf ./cloudbeaver
-mkdir ./cloudbeaver
-mkdir ./cloudbeaver/server
-mkdir ./cloudbeaver/conf
-mkdir ./cloudbeaver/workspace
-mkdir ./cloudbeaver/web
-
-echo "Pull cloudbeaver platform"
-
-cd ../..
-
-echo "Pull dbeaver platform"
-[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git
-
-cd cloudbeaver/deploy
-
-echo "Build CloudBeaver server"
-
-cd ../server/product/aggregate
-mvn clean verify -U -Dheadless-platform
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Could not perform package'; exit $rc
-fi
-cd ../../../deploy
-
-echo "Copy server packages"
-
-cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
-cp -p ./scripts/* ./cloudbeaver
-mkdir cloudbeaver/samples
-
-if [[ ! -z "${SAMPLE_DATABASE_PATH}"  ]]; then
-  mkdir cloudbeaver/samples/db
-  cp -rp "${SAMPLE_DATABASE_PATH}" cloudbeaver/samples/
-fi
-
-cp -rp  ../config/core/* cloudbeaver/conf
-cp -rp "${CONFIGURATION_PATH}"/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
-cp -p "${CONFIGURATION_PATH}"/*.conf cloudbeaver/conf/
-mv drivers cloudbeaver
-
-echo "Build static content"
-
-cd ../
-
-cd ../cloudbeaver/webapp
-
-yarn
-yarn lerna run bootstrap
-yarn lerna run bundle --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Application build failed'; exit $rc
-fi
-
-cd ../deploy
-
-echo "Copy static content"
-
-cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
-
-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+source build-backend.sh 
+source build-frontend.sh

deploy/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:23.10
 
 MAINTAINER DBeaver Corp, devops@dbeaver.com
 
@@ -7,6 +7,7 @@ RUN set -eux; \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
         curl \
+        wget \
         # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
         # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
         # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077

deploy/scripts/run-server.bat

@@ -1,5 +1,5 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 

deploy/scripts/run-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
+launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
@@ -9,7 +9,7 @@ echo "Starting Cloudbeaver Server"
   && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] \
   && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
-java ${JAVA_OPTS} \
+exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
   --add-modules=ALL-SYSTEM \
   --add-opens=java.base/java.io=ALL-UNNAMED \

javaConfig.json

@@ -1,4 +1,4 @@
 {
-  "projects": ["../dbeaver", "../cloudbeaver/server"],
+  "projects": ["../dbeaver-common", "../dbeaver", "../cloudbeaver/server"],
   "targetPlatform": "./org.jkiss.cloudbeaver.tp.target"
 }

project.deps

@@ -0,0 +1,2 @@
+dbeaver-common
+dbeaver

server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.42.qualifier
-Bundle-Release-Date: 20231204
+Bundle-Version: 1.0.52.qualifier
+Bundle-Release-Date: 20240506
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -18,7 +18,7 @@ Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.bundle.graphql.java;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
  com.google.gson;visibility:=reexport,
- jakarta.servlet-api;bundle-version="[4.0.0,4.0.0]";visibility:=reexport
+ jakarta.servlet;visibility:=reexport
 Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth,
  io.cloudbeaver.auth.provider,
@@ -33,6 +33,7 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.model.rm.lock,
  io.cloudbeaver.model.session,
  io.cloudbeaver.model.user,
+ io.cloudbeaver.model.utils,
  io.cloudbeaver.registry,
  io.cloudbeaver.server,
  io.cloudbeaver.service,

server/bundles/io.cloudbeaver.model/plugin.xml

@@ -19,4 +19,9 @@
         </metaParameters>
     </extension>
 
+    <extension point="com.dbeaver.secretController">
+        <controller id="void-secret" class="io.cloudbeaver.model.app.VoidSecretController"
+                    label="Default secret controller" description="Default void secret controller"/>
+    </extension>
+
 </plugin>

server/bundles/io.cloudbeaver.model/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.42-SNAPSHOT</version>
+    <version>1.0.52-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/BaseWebProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -22,19 +22,21 @@ import org.jkiss.dbeaver.model.rm.RMConstants;
 /**
  * General constants
  */
-public class DBWConstants {
+public interface DBWConstants {
 
-    public static final String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
+    String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
 
-    public static final String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
-    public static final String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
+    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+    String PERMISSION_SECRET_MANAGER = "secret-manager";
 
-    public static final String PERMISSION_EDIT_STRUCTURE = "edit-meta";
-    public static final String PERMISSION_EDIT_DATA = "edit-data";
 
-    public static final String STATE_ATTR_SIGN_IN_STATE = "state.signin";
+    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
+    String PERMISSION_EDIT_DATA = "edit-data";
 
-    public enum SignInState {
+    String STATE_ATTR_SIGN_IN_STATE = "state.signin";
+
+    enum SignInState {
         GLOBAL,
         EMBEDDED
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWFeatureSet.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWUserIdentity.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DataSourceFilter.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
@@ -51,6 +52,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         this.dataSourceFilter = filter;
     }
 
+    @NotNull
     @Override
     public DBPProject getProject() {
         return dataSourceRegistry.getProject();
@@ -58,7 +60,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @Nullable
     @Override
-    public DBPDataSourceContainer getDataSource(String id) {
+    public DBPDataSourceContainer getDataSource(@NotNull String id) {
         DBPDataSourceContainer dataSource = dataSourceRegistry.getDataSource(id);
         if (dataSource == null || dataSourceFilter != null && !dataSourceFilter.filter(dataSource)) {
             return null;
@@ -68,7 +70,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @Nullable
     @Override
-    public DBPDataSourceContainer getDataSource(DBPDataSource dataSource) {
+    public DBPDataSourceContainer getDataSource(@NotNull DBPDataSource dataSource) {
         if (dataSourceFilter != null && !dataSourceFilter.filter(dataSource.getContainer())) {
             return null;
         }
@@ -107,13 +109,13 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @NotNull
     @Override
-    public DBPDataSourceContainer createDataSource(DBPDriver driver, DBPConnectionConfiguration connConfig) {
+    public DBPDataSourceContainer createDataSource(@NotNull DBPDriver driver, @NotNull DBPConnectionConfiguration connConfig) {
         return dataSourceRegistry.createDataSource(driver, connConfig);
     }
 
     @NotNull
     @Override
-    public DBPDataSourceContainer createDataSource(DBPDataSourceContainer source) {
+    public DBPDataSourceContainer createDataSource(@NotNull DBPDataSourceContainer source) {
         return dataSourceRegistry.createDataSource(source);
     }
 
@@ -164,18 +166,20 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         return dataSourceRegistry.getRootFolders();
     }
 
+    @Nullable
     @Override
-    public DBPDataSourceFolder getFolder(String path) {
+    public DBPDataSourceFolder getFolder(@NotNull String path) {
         return dataSourceRegistry.getFolder(path);
     }
 
+    @NotNull
     @Override
-    public DBPDataSourceFolder addFolder(DBPDataSourceFolder parent, String name) {
+    public DBPDataSourceFolder addFolder(@Nullable DBPDataSourceFolder parent, @NotNull String name) {
         return dataSourceRegistry.addFolder(parent, name);
     }
 
     @Override
-    public void removeFolder(DBPDataSourceFolder folder, boolean dropContents) {
+    public void removeFolder(@NotNull DBPDataSourceFolder folder, boolean dropContents) {
         dataSourceRegistry.removeFolder(folder, dropContents);
     }
 
@@ -197,18 +201,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateSavedFilter(DBSObjectFilter filter) {
+    public void updateSavedFilter(@NotNull DBSObjectFilter filter) {
         dataSourceRegistry.updateSavedFilter(filter);
     }
 
     @Override
-    public void removeSavedFilter(String filterName) {
+    public void removeSavedFilter(@NotNull String filterName) {
         dataSourceRegistry.removeSavedFilter(filterName);
     }
 
     @Nullable
     @Override
-    public DBWNetworkProfile getNetworkProfile(String source, String name) {
+    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
         return dataSourceRegistry.getNetworkProfile(source, name);
     }
 
@@ -219,18 +223,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateNetworkProfile(DBWNetworkProfile profile) {
+    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
         dataSourceRegistry.updateNetworkProfile(profile);
     }
 
     @Override
-    public void removeNetworkProfile(DBWNetworkProfile profile) {
+    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
         dataSourceRegistry.removeNetworkProfile(profile);
     }
 
     @Nullable
     @Override
-    public DBAAuthProfile getAuthProfile(String id) {
+    public DBAAuthProfile getAuthProfile(@NotNull String id) {
         return dataSourceRegistry.getAuthProfile(id);
     }
 
@@ -247,10 +251,15 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateAuthProfile(DBAAuthProfile profile) {
+    public void updateAuthProfile(@NotNull DBAAuthProfile profile) {
         dataSourceRegistry.updateAuthProfile(profile);
     }
 
+    @Override
+    public void setAuthProfiles(@NotNull Collection<DBAAuthProfile> profiles) {
+        dataSourceRegistry.setAuthProfiles(profiles);
+    }
+
     @Override
     public void removeAuthProfile(DBAAuthProfile profile) {
         dataSourceRegistry.removeAuthProfile(profile);
@@ -271,6 +280,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         dataSourceRegistry.refreshConfig(dataSourceIds);
     }
 
+    @Nullable
     @Override
     public Throwable getLastError() {
         return dataSourceRegistry.getLastError();
@@ -287,7 +297,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void notifyDataSourceListeners(DBPEvent event) {
+    public void notifyDataSourceListeners(@NotNull DBPEvent event) {
         dataSourceRegistry.notifyDataSourceListeners(event);
     }
 
@@ -307,11 +317,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         dataSourceRegistry.setAuthCredentialsProvider(authCredentialsProvider);
     }
 
+    @NotNull
     @Override
     public Set<DBPDataSourceFolder> getTemporaryFolders() {
         return dataSourceRegistry.getTemporaryFolders();
     }
 
+    @NotNull
+    @Override
+    public DBPPreferenceStore getPreferenceStore() {
+        return dataSourceRegistry.getPreferenceStore();
+    }
+
     @Override
     public boolean loadDataSources(
         @NotNull List<DBPDataSourceConfigurationStorage> storages,

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebPage.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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,11 +17,13 @@
 package io.cloudbeaver;
 
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.registry.rm.DataSourceRegistryRM;
@@ -29,17 +31,21 @@ import org.jkiss.dbeaver.runtime.DBWorkbench;
 
 public abstract class WebProjectImpl extends BaseWebProjectImpl {
     private static final Log log = Log.getLog(WebProjectImpl.class);
-
+    @NotNull
+    private final DBPPreferenceStore preferenceStore;
     public WebProjectImpl(
         @NotNull DBPWorkspace workspace,
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
         @NotNull RMProject project,
-        @NotNull DataSourceFilter dataSourceFilter
+        @NotNull DataSourceFilter dataSourceFilter,
+        @NotNull DBPPreferenceStore preferenceStore
     ) {
         super(workspace, resourceController, sessionContext, project, dataSourceFilter);
+        this.preferenceStore = preferenceStore;
     }
 
+    @Nullable
     @Override
     public Object getProjectProperty(String propName) {
         try {
@@ -51,7 +57,7 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
     }
 
     @Override
-    public void setProjectProperty(String propName, Object propValue) {
+    public void setProjectProperty(@NotNull String propName, @Nullable Object propValue) {
         try {
             getResourceController().setProjectProperty(getId(), propName, propValue);
         } catch (DBException e) {
@@ -68,7 +74,7 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
     @Override
     protected DBPDataSourceRegistry createDataSourceRegistry() {
         return new WebDataSourceRegistryProxy(
-            new DataSourceRegistryRM(this, getResourceController()),
+            new DataSourceRegistryRM(this, getResourceController(), preferenceStore),
             dataSourceFilter
         );
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -26,8 +26,19 @@ public class WebSessionProjectImpl extends WebProjectImpl {
 
     private final WebSession webSession;
 
-    public WebSessionProjectImpl(@NotNull WebSession webSession, @NotNull RMProject project, @NotNull DataSourceFilter dataSourceFilter) {
-        super(webSession.getWorkspace(), webSession.getRmController(), webSession.getSessionContext(), project, dataSourceFilter);
+    public WebSessionProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter
+    ) {
+        super(
+            webSession.getWorkspace(),
+            webSession.getRmController(),
+            webSession.getSessionContext(),
+            project,
+            dataSourceFilter,
+            webSession.getUserPreferenceStore()
+        );
         this.webSession = webSession;
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/CBAuthConstants.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -25,6 +25,7 @@ public interface CBAuthConstants {
     String CB_AUTH_ID_REQUEST_PARAM = "authId";
     String CB_AUTO_LOGIN_REQUEST_PARAM = "autoLogin";
     String CB_REDIRECT_URL_REQUEST_PARAM = "redirectUrl";
+    String CB_FORCE_SESSIONS_LOGOUT = "forceSessionsLogout";
 
     // Default max idle time (10 minutes)
     long MAX_SESSION_IDLE_TIME = 10 * 60 * 1000;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/NoAuthCredentialsProvider.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderExternal.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderFederated.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -19,6 +19,7 @@ package io.cloudbeaver.auth;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
 
 import java.util.Map;
 
@@ -26,17 +27,18 @@ import java.util.Map;
  * Federated auth provider.
  * Provides links to external auth resource
  */
-public interface SMAuthProviderFederated {
+public interface SMAuthProviderFederated extends SMSignOutLinkProvider {
 
-    /**
-     * Returns new identifying credentials which can be used to find/create user in database
-     */
     @NotNull
     String getSignInLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
-
-    @NotNull
-    String getSignOutLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    @Override
+    default String getUserSignOutLink(
+        @NotNull SMAuthProviderCustomConfiguration providerConfig,
+        @NotNull Map<String, Object> userCredentials
+    ) throws DBException {
+        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters());
+    }
 
     @Nullable
     String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAutoAssign.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMBruteForceProtected.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.server.events;
+package io.cloudbeaver.auth;
 
-import io.cloudbeaver.server.CBPlatform;
 import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.websocket.WSEventHandler;
-import org.jkiss.dbeaver.model.websocket.event.WSUserDeletedEvent;
 
-public class WSUserDeletedEventHandler<EVENT extends WSUserDeletedEvent> implements WSEventHandler<EVENT> {
-    @Override
-    public void handleEvent(@NotNull EVENT event) {
-        CBPlatform.getInstance().getSessionManager().closeUserSessions(event.getDeletedUserId());
-    }
+import java.util.Map;
+
+public interface SMBruteForceProtected {
+    Object getInputUsername(@NotNull Map<String, Object> cred);
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMSignOutLinkProvider.java

@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+
+import java.util.Map;
+
+public interface SMSignOutLinkProvider {
+
+    /**
+     * @return a common link for logout, not related with the user context
+     */
+    @NotNull
+    String getCommonSignOutLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
+    String getUserSignOutLink(
+        @NotNull SMAuthProviderCustomConfiguration providerConfig,
+        @NotNull Map<String, Object> userCredentials
+    ) throws DBException;
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMTokenCredentialProvider.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/local/LocalAuthProviderConstants.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provisioning/SMProvisioner.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -31,4 +31,8 @@ public interface SMProvisioner {
         @NotNull SMAuthProviderCustomConfiguration customConfiguration,
         @NotNull SMProvisioningFilter filter
     ) throws DBException;
+
+    default boolean isAuthRoleProvided(SMAuthProviderCustomConfiguration configuration) {
+        return false;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/BaseDatasourceAccessCheckHandler.java

@@ -0,0 +1,30 @@
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPDataSourceHandler;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+
+public abstract class BaseDatasourceAccessCheckHandler implements DBPDataSourceHandler {
+    @Override
+    public void beforeConnect(
+        DBRProgressMonitor monitor,
+        @NotNull DBPDataSourceContainer dataSourceContainer
+    ) throws DBException {
+        if (isDriverDisabled(dataSourceContainer.getDriver())) {
+            throw new DBException("Driver disabled");
+        }
+    }
+
+    @Override
+    public void beforeDisconnect(
+        DBRProgressMonitor monitor,
+        @NotNull DBPDataSourceContainer dataSourceContainer
+    ) throws DBException {
+
+    }
+
+    protected abstract boolean isDriverDisabled(DBPDriver driver);
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebAsyncTaskInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebBasicObjectInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionFolderInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -443,4 +443,17 @@ public class WebConnectionInfo {
         closeListeners.add(listener);
     }
 
+    @Property
+    public int getKeepAliveInterval() {
+        return dataSourceContainer.getConnectionConfiguration().getKeepAliveInterval();
+    }
+
+    @Property
+    public List<WebSecretInfo> getSharedSecrets() throws DBException {
+        return dataSourceContainer.listSharedCredentials()
+            .stream()
+            .map(WebSecretInfo::new)
+            .collect(Collectors.toList());
+    }
+
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionOriginInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfig.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -18,14 +18,10 @@ package io.cloudbeaver.model;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
-import org.jkiss.dbeaver.model.net.DBWHandlerDescriptor;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
-import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
-import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
-import org.jkiss.dbeaver.runtime.properties.PropertySourceMap;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.LinkedHashMap;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfigInput.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebObjectOrigin.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebProjectInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.rm.RMResourceType;
 import org.jkiss.utils.ArrayUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 public class WebProjectInfo {
     private final WebSession session;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebPropertyInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -18,6 +18,7 @@ package io.cloudbeaver.model;
 
 import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
@@ -27,6 +28,7 @@ import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.meta.PropertyLength;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
+import org.jkiss.dbeaver.registry.settings.ProductSettingDescriptor;
 import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
 import org.jkiss.utils.CommonUtils;
 
@@ -173,6 +175,11 @@ public class WebPropertyInfo {
         return new String[0];
     }
 
+    @Property
+    public boolean isRequired() {
+        return property.isRequired();
+    }
+
     public boolean hasFeature(@NotNull String feature) {
         return property.hasFeature(feature);
     }
@@ -237,4 +244,12 @@ public class WebPropertyInfo {
         return CommonUtils.toString(value);
     }
 
+    @Nullable
+    @Property
+    public List<String> getScopes() {
+        if (property instanceof ProductSettingDescriptor productSettingDescriptor) {
+            return productSettingDescriptor.getScopes();
+        }
+        return null;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java

@@ -0,0 +1,38 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.secret.DBSSecretValue;
+
+public class WebSecretInfo {
+    private final DBSSecretValue secretValue;
+
+    public WebSecretInfo(DBSSecretValue secretValue) {
+        this.secretValue = secretValue;
+    }
+
+    @Property
+    public String getDisplayName() {
+        return secretValue.getDisplayName();
+    }
+
+    @Property
+    public String getSecretId() {
+        return secretValue.getUniqueId();
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebServerError.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebServerMessage.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseAuthWebAppConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java

@@ -0,0 +1,34 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.app;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * Abstract class that contains methods for loading configuration with gson.
+ */
+public abstract class BaseServerConfigurationController<T extends WebServerConfiguration> implements WebServerConfigurationController<T> {
+
+    protected Gson getGson() {
+        return getGsonBuilder().create();
+    }
+
+    protected abstract GsonBuilder getGsonBuilder();
+
+    public abstract T getServerConfiguration();
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -29,14 +29,13 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public static final String DEFAULT_APP_ANONYMOUS_TEAM_NAME = "user";
 
     protected final Map<String, Object> plugins;
-    protected String defaultUserTeam;
+    protected String defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
     protected boolean resourceManagerEnabled;
     protected boolean showReadOnlyConnectionInfo;
     protected String[] enabledFeatures;
 
     public BaseWebAppConfiguration() {
         this.plugins = new LinkedHashMap<>();
-        this.defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
         this.resourceManagerEnabled = true;
         this.enabledFeatures = null;
         this.showReadOnlyConnectionInfo = false;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -16,8 +16,6 @@
  */
 package io.cloudbeaver.model.app;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import io.cloudbeaver.DataSourceFilter;
 import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.WebSessionProjectImpl;
@@ -35,6 +33,7 @@ import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
 import org.jkiss.dbeaver.model.rm.RMController;
@@ -101,8 +100,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return true;
     }
 
-    @Nullable
-    protected Path loadServerConfiguration() throws DBException {
+    protected boolean loadServerConfiguration() throws DBException {
         Path configFilePath = getMainConfigurationFilePath().toAbsolutePath();
         Path configFolder = configFilePath.getParent();
 
@@ -119,13 +117,13 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         // Load config file
         log.debug("Loading configuration from " + configFilePath);
         try {
-            loadConfiguration(configFilePath);
+            getServerConfigurationController().loadServerConfiguration(configFilePath);
         } catch (Exception e) {
             log.error("Error parsing configuration", e);
-            return null;
+            return false;
         }
 
-        return configFilePath;
+        return true;
     }
 
     @Nullable
@@ -152,7 +150,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return getLogbackConfigPath(configFolder);
     }
 
-    private Path getMainConfigurationFilePath() {
+    protected Path getMainConfigurationFilePath() {
         String configPath = DEFAULT_CONFIG_FILE_PATH;
 
         String[] args = Platform.getCommandLineArgs();
@@ -178,8 +176,6 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return Files.exists(customConfigPath) ? customConfigPath : configPath.resolve(fileName);
     }
 
-    protected abstract void loadConfiguration(Path configPath) throws DBException;
-
     @Override
     public WebProjectImpl createProjectImpl(
         @NotNull WebSession webSession,
@@ -199,11 +195,14 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
      * Advanced apps may implement it differently.
      */
     @Override
-    public DBSSecretController getSecretController(@NotNull SMCredentialsProvider credentialsProvider)  throws DBException {
+    public DBSSecretController getSecretController(
+        @NotNull SMCredentialsProvider credentialsProvider,
+        SMSessionContext smSessionContext
+    ) throws DBException {
         return VoidSecretController.INSTANCE;
     }
 
-    protected Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
+    public static Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
         return JSONUtils.getObject(configProps, "server");
     }
 
@@ -231,6 +230,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
 
     @Override
     public Object start(IApplicationContext context) {
+        initializeApplicationServices();
         try {
             startServer();
         } catch (Exception e) {
@@ -265,10 +265,10 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return null;
     }
 
-    protected Gson getGson() {
-        return getGsonBuilder().create();
+    public abstract WebServerConfigurationController getServerConfigurationController();
+
+    @Override
+    public boolean isEnvironmentVariablesAccessible() {
+        return false;
     }
-
-    protected abstract GsonBuilder getGsonBuilder();
-
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/VoidSecretController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -19,12 +19,20 @@ package io.cloudbeaver.model.app;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.exec.DBCFeatureNotSupportedException;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
+import org.jkiss.dbeaver.model.secret.DBSSecretControllerAuthorized;
+import org.jkiss.dbeaver.model.secret.DBSSecretObject;
+import org.jkiss.dbeaver.model.secret.DBSSecretValue;
+
+import java.util.List;
 
 /**
  * Void secret controller.
  */
-public class VoidSecretController implements DBSSecretController {
+public class VoidSecretController implements DBSSecretController, DBSSecretControllerAuthorized {
 
     public static final VoidSecretController INSTANCE = new VoidSecretController();
 
@@ -34,17 +42,30 @@ public class VoidSecretController implements DBSSecretController {
 
     @Nullable
     @Override
-    public String getSecretValue(@NotNull String secretId) {
+    public String getPrivateSecretValue(@NotNull String secretId) {
         return null;
     }
 
     @Override
-    public void setSecretValue(@NotNull String secretId, @Nullable String secretValue) throws DBException {
+    public void setPrivateSecretValue(@NotNull String secretId, @Nullable String secretValue) throws DBException {
         throw new DBException("Secret controller is read-only");
     }
 
+    @NotNull
+    @Override
+    public List<DBSSecretValue> discoverCurrentUserSecrets(@NotNull DBSSecretObject secretObject) throws DBException {
+        throw new DBCFeatureNotSupportedException("Secrets discovery not supported");
+    }
+
     @Override
     public void flushChanges() {
     }
 
+    @Override
+    public void authorize(
+        @Nullable SMCredentialsProvider credentialsProvider,
+        @Nullable SMSessionContext smSessionContext
+    ) throws DBException {
+
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -25,6 +25,7 @@ import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.app.DBPApplication;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
@@ -42,6 +43,8 @@ public interface WebApplication extends DBPApplication {
 
     WebAppConfiguration getAppConfiguration();
 
+    WebServerConfiguration getServerConfiguration();
+
     Path getDataDirectory(boolean create);
 
     Path getWorkspaceDirectory();
@@ -60,7 +63,10 @@ public interface WebApplication extends DBPApplication {
 
     SMAdminController getAdminSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
 
-    DBSSecretController getSecretController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
+    DBSSecretController getSecretController(
+        @NotNull SMCredentialsProvider credentialsProvider,
+        SMSessionContext smSessionContext
+    ) throws DBException;
 
     RMController createResourceController(
         @NotNull SMCredentialsProvider credentialsProvider,

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAuthApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -20,6 +20,8 @@ package io.cloudbeaver.model.app;
 import io.cloudbeaver.auth.CBAuthConstants;
 import org.jkiss.dbeaver.DBException;
 
+import java.util.List;
+
 public interface WebAuthApplication extends WebApplication {
     WebAuthConfiguration getAuthConfiguration();
 
@@ -30,4 +32,6 @@ public interface WebAuthApplication extends WebApplication {
     }
 
     void flushConfiguration() throws DBException;
+
+    String getDefaultAuthRole();
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAuthConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfiguration.java

@@ -0,0 +1,30 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.app;
+
+/**
+ * Web server configuration.
+ * Contains only server configuration properties.
+ */
+public interface WebServerConfiguration {
+    boolean isDevelMode();
+
+    default String getRootURI() {
+        return "";
+    }
+
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java

@@ -0,0 +1,34 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.app;
+
+import org.jkiss.dbeaver.DBException;
+
+import java.nio.file.Path;
+
+/**
+ * Server configuration controller.
+ * Works with app server configuration (loads, updates)
+ */
+public interface WebServerConfigurationController<T extends WebServerConfiguration> {
+
+    /**
+     * Loads server configuration.
+     */
+    void loadServerConfiguration(Path configPath) throws DBException;
+
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/fs/FSUtils.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java

@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.cloudbeaver.model.rm;
@@ -56,19 +56,25 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return project.getId();
     }
 
+    @NotNull
+    @Override
+    public String getNodeId() {
+        return project.getId();
+    }
+
     @Override
     public String getNodeType() {
         return "rm.project";
     }
 
     @Override
-    public String getNodeName() {
+    public String getNodeDisplayName() {
         return project.getDisplayName();
     }
 
     @Override
     public String getLocalizedName(String locale) {
-        return getNodeName();
+        return getNodeDisplayName();
     }
 
     @Override
@@ -105,6 +111,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
     }
 
+    @Deprecated
     @Override
     public String getNodeItemPath() {
         return getParentNode().getNodeItemPath() + "/" + getName();
@@ -118,7 +125,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
 
     @Override
     public String toString() {
-        return getNodeName();
+        return getNodeDisplayName();
     }
 
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java

@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.cloudbeaver.model.rm;
@@ -55,7 +55,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
     }
 
     @Override
-    public String getNodeName() {
+    public String getNodeDisplayName() {
         return resource.getName();
     }
 
@@ -80,7 +80,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
             }
             return DBIcon.TREE_FOLDER;
         } else {
-            var fileExtension = IOUtils.getFileExtension(getNodeName());
+            var fileExtension = IOUtils.getFileExtension(getNodeDisplayName());
             if (!CommonUtils.isEmpty(fileExtension)) {
                 RMProject project = getProjectNode();
                 if (project != null) {
@@ -154,9 +154,10 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         throw new DBException("Can't detect resource root node");
     }
 
+    @Deprecated
     @Override
     public String getNodeItemPath() {
-        return getParentNode().getNodeItemPath() + "/" + getNodeName();
+        return getParentNode().getNodeItemPath() + "/" + getNodeDisplayName();
     }
 
     @Override
@@ -174,7 +175,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         String resourceName = resource.getName();
         try {
             if (newName.indexOf('.') == -1) {
-                String ext = IOUtils.getFileExtension(getNodeName());
+                String ext = IOUtils.getFileExtension(getNodeDisplayName());
                 if (!CommonUtils.isEmpty(ext)) {
                     newName += "." + ext;
                 }
@@ -193,7 +194,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
 
     @Override
     public String toString() {
-        return getNodeName();
+        return getNodeDisplayName();
     }
 
     @Nullable

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java

@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.cloudbeaver.model.rm;
@@ -54,8 +54,14 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return "rm";
     }
 
+    @NotNull
     @Override
-    public String getNodeName() {
+    public String getNodeId() {
+        return "rm";
+    }
+
+    @Override
+    public String getNodeDisplayName() {
         return "resources";
     }
 
@@ -103,10 +109,11 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return projects;
     }
 
+    @Deprecated
     @Override
     public String getNodeItemPath() {
         // Path doesn't include project name
-        return NodePathType.ext.getPrefix() + getNodeName();
+        return NodePathType.ext.getPrefix() + getNodeDisplayName();
     }
 
     @Override
@@ -115,11 +122,6 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return this;
     }
 
-    @Override
-    public String toString() {
-        return getNodeName();
-    }
-
     @Override
     public boolean isHidden() {
         return true;
@@ -152,8 +154,13 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
             return;
         }
         var projectNode = getProjectNode(project);
-        var rmResourcePath = Arrays.asList(resourcePath.split("/"));
-        projectNode.ifPresent(dbnResourceManagerProject -> dbnResourceManagerProject.removeChildResourceNode(new ArrayDeque<>(rmResourcePath)));
+        var rmResourcePath = Arrays.stream(resourcePath.split("/"))
+            .filter(CommonUtils::isNotEmpty)
+            .toList();
+        projectNode.ifPresent(
+            dbnResourceManagerProject -> dbnResourceManagerProject.removeChildResourceNode(new ArrayDeque<>(
+                rmResourcePath))
+        );
     }
 
     @NotNull

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/RMControllerInvocationHandler.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -48,6 +48,7 @@ import org.jkiss.dbeaver.model.websocket.event.WSEventType;
 import org.jkiss.dbeaver.model.websocket.event.WSSessionLogUpdatedEvent;
 import org.jkiss.dbeaver.registry.*;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
@@ -281,7 +282,7 @@ public class LocalResourceController implements RMController {
                 throw new DBException("Error creating shared project path", e);
             }
         }
-        validateResourcePath(name, PROJECT_REGEX);
+        validateResourcePath(name);
         RMProject project;
         var projectPath = sharedProjectsPath.resolve(name);
         if (Files.exists(projectPath)) {
@@ -461,6 +462,7 @@ public class LocalResourceController implements RMController {
                     DBPDataSourceRegistry registry = project.getDataSourceRegistry();
                     var result = Path.of(folderPath);
                     var newName = result.getFileName().toString();
+                    GeneralUtils.validateResourceName(newName);
                     var parent = result.getParent();
                     var parentFolder = parent == null ? null : registry.getFolder(parent.toString().replace("\\", "/"));
                     DBPDataSourceFolder newFolder = registry.addFolder(parentFolder, newName);
@@ -835,19 +837,10 @@ public class LocalResourceController implements RMController {
     }
 
     private void validateResourcePath(String resourcePath) throws DBException {
-        validateResourcePath(resourcePath, FILE_REGEX);
-    }
-
-    private void validateResourcePath(String resourcePath, String regex) throws DBException {
         var fullPath = Paths.get(resourcePath);
         for (Path path : fullPath) {
-            if (path.toString().startsWith(".")) {
-                throw new DBException("Resource path '" + resourcePath + "' can't start with dot");
-            }
-        }
-        if (!resourcePath.matches(regex)) {
-            String illegalCharacters = resourcePath.replaceAll(regex, " ").strip();
-            throw new DBException("Resource path '" + resourcePath + "' contains illegal characters: " + illegalCharacters);
+            String fileName = IOUtils.getFileNameWithoutExtension(path);
+            GeneralUtils.validateResourceName(fileName);
         }
     }
 
@@ -1162,6 +1155,11 @@ public class LocalResourceController implements RMController {
         return new Builder(workspace, credentialsProvider, smControllerSupplier);
     }
 
+    @Override
+    public String ping() {
+        return "pong (RM)";
+    }
+
     public static final class Builder {
         private final SMCredentialsProvider credentialsProvider;
         private final Supplier<SMController> smController;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMFileOperation.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMFileOperationHandler.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMFileOperationHandlerDescriptor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMFileOperationHandlersRegistry.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMFileLockController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMLock.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/lock/RMLockInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -114,7 +114,9 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     public synchronized void refreshUserData() {
         try {
             userContext.refreshPermissions();
-            userContext.refreshAccessibleProjects();
+            if (userContext.isAuthorizedInSecurityManager()) {
+                userContext.refreshAccessibleProjects();
+            }
         } catch (DBException e) {
             addSessionError(e);
             log.error("Error refreshing accessible projects", e);
@@ -133,6 +135,11 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         return workspace.getAuthContext();
     }
 
+    protected void clearSessionContext() {
+        this.workspace.getAuthContext().clear();
+        this.workspace.getAuthContext().addSession(this);
+    }
+
     @NotNull
     @Property
     public String getSessionId() {
@@ -166,6 +173,14 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     @Override
     public void close() {
         super.close();
+        cleanUpSession();
+    }
+
+    public void close(boolean clearTokens) {
+        cleanUpSession();
+    }
+
+    private void cleanUpSession() {
         var sessionExpiredEvent = new WSSessionExpiredEvent();
         application.getEventController().addEvent(new WSEventDeleteTempFile(getSessionId()));
         synchronized (sessionEventHandlers) {
@@ -180,6 +195,8 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
             sessionEventHandlers.clear();
 
             workspace.dispose();
+
+            clearSessionContext();
         }
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebActionParameters.java

@@ -1,18 +1,18 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
- * All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * NOTICE:  All information contained herein is, and remains
- * the property of DBeaver Corp and its suppliers, if any.
- * The intellectual and technical concepts contained
- * herein are proprietary to DBeaver Corp and its suppliers
- * and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from DBeaver Corp.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.cloudbeaver.model.session;
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebAsyncTaskProcessor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebAuthInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -22,6 +22,7 @@ import io.cloudbeaver.model.user.WebUserOriginInfo;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.auth.SMAuthInfo;
 import org.jkiss.dbeaver.model.auth.SMAuthProvider;
 import org.jkiss.dbeaver.model.auth.SMSession;
 import org.jkiss.dbeaver.model.auth.SMSessionPrincipal;
@@ -41,7 +42,10 @@ public class WebAuthInfo implements SMSessionPrincipal {
     private final WebUser user;
     private final WebAuthProviderDescriptor authProvider;
     private String authProviderConfigurationId;
-    private SMSession authSession;
+    @NotNull
+    private final SMAuthInfo authInfo;
+    @NotNull
+    private final SMSession authSession;
     private final OffsetDateTime loginTime;
     private final DBWUserIdentity userIdentity;
     private String message;
@@ -54,11 +58,14 @@ public class WebAuthInfo implements SMSessionPrincipal {
         @NotNull WebAuthProviderDescriptor authProvider,
         @NotNull DBWUserIdentity userIdentity,
         @NotNull SMSession authSession,
-        @NotNull OffsetDateTime loginTime) {
+        @NotNull SMAuthInfo authInfo,
+        @NotNull OffsetDateTime loginTime
+    ) {
         this.session = session;
         this.user = user;
         this.authProvider = authProvider;
         this.userIdentity = userIdentity;
+        this.authInfo = authInfo;
         this.authSession = authSession;
         this.loginTime = loginTime;
     }
@@ -119,10 +126,16 @@ public class WebAuthInfo implements SMSessionPrincipal {
         return authProvider;
     }
 
+    @NotNull
     public SMSession getAuthSession() {
         return authSession;
     }
 
+    @NotNull
+    public SMAuthInfo getAuthInfo() {
+        return authInfo;
+    }
+
     void closeAuth() {
         if (authProvider != null && authSession != null) {
             try {
@@ -130,8 +143,6 @@ public class WebAuthInfo implements SMSessionPrincipal {
                 authProviderInstance.closeSession(session, authSession);
             } catch (Exception e) {
                 log.error(e);
-            } finally {
-                authSession = null;
             }
         }
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebHeadlessSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -19,6 +19,7 @@ package io.cloudbeaver.model.session;
 import io.cloudbeaver.model.WebServerMessage;
 import io.cloudbeaver.model.app.WebAuthApplication;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.auth.SMSessionPrincipal;
 
@@ -43,6 +44,7 @@ public class WebHeadlessSession extends BaseWebSession {
 
     }
 
+    @Nullable
     @Override
     public SMSessionPrincipal getSessionPrincipal() {
         return null;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -33,6 +33,7 @@ import io.cloudbeaver.service.sql.WebSQLConstants;
 import io.cloudbeaver.utils.CBModelConstants;
 import io.cloudbeaver.utils.WebAppUtils;
 import io.cloudbeaver.utils.WebDataSourceUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -55,6 +56,7 @@ import org.jkiss.dbeaver.model.fs.DBFFileSystemManager;
 import org.jkiss.dbeaver.model.meta.Association;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMProjectType;
@@ -77,9 +79,6 @@ import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
 import org.jkiss.utils.CommonUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.lang.reflect.InvocationTargetException;
 import java.time.Instant;
 import java.util.*;
@@ -91,7 +90,7 @@ import java.util.stream.Collectors;
  * Is the main source of data in web application
  */
 public class WebSession extends BaseWebSession
-    implements SMSession, SMCredentialsProvider, DBACredentialsProvider, IAdaptable {
+    implements SMSessionWithAuth, SMCredentialsProvider, DBACredentialsProvider, IAdaptable {
 
     private static final Log log = Log.getLog(WebSession.class);
 
@@ -100,6 +99,7 @@ public class WebSession extends BaseWebSession
     private static final String ATTR_LOCALE = "locale";
     private static final AtomicInteger TASK_ID = new AtomicInteger();
 
+    public static String RUNTIME_PARAM_AUTH_INFOS = "auth-infos";
     private final AtomicInteger taskCount = new AtomicInteger();
 
     private String lastRemoteAddr;
@@ -124,16 +124,24 @@ public class WebSession extends BaseWebSession
     private final Map<String, DBWSessionHandler> sessionHandlers;
 
     public WebSession(
-        @NotNull HttpSession httpSession,
+        @NotNull HttpServletRequest request,
         @NotNull WebAuthApplication application,
         @NotNull Map<String, DBWSessionHandler> sessionHandlers
     ) throws DBException {
-        super(httpSession.getId(), application);
+        super(request.getSession().getId(), application);
         this.lastAccessTime = this.createTime;
-        setLocale(CommonUtils.toString(httpSession.getAttribute(ATTR_LOCALE), this.locale));
+        setLocale(CommonUtils.toString(request.getSession().getAttribute(ATTR_LOCALE), this.locale));
         this.sessionHandlers = sessionHandlers;
+        //force authorization of anonymous session to avoid access error,
+        //because before authorization could be called by any request,
+        //but now 'updateInfo' is called only in special requests,
+        //and the order of requests is not guaranteed.
+        //look at CB-4747
+        refreshSessionAuth();
+        updateSessionParameters(request);
     }
 
+    @Nullable
     @Override
     public SMSessionPrincipal getSessionPrincipal() {
         synchronized (authTokens) {
@@ -273,34 +281,38 @@ public class WebSession extends BaseWebSession
                 continue;
             }
             switch (type) {
-                case DATASOURCE_CREATED: {
+                case DATASOURCE_CREATED -> {
                     WebConnectionInfo connectionInfo = new WebConnectionInfo(this, ds);
-                    this.connections.put(connectionInfo.getId(), connectionInfo);
+                    this.connections.put(getConnectionId(ds), connectionInfo);
                     sendDataSourceUpdatedEvent = true;
-                    break;
                 }
-                case DATASOURCE_UPDATED: {
-                    // if settings were changed we need to send event
+                case DATASOURCE_UPDATED -> // if settings were changed we need to send event
                     sendDataSourceUpdatedEvent |= !ds.equalSettings(oldDataSources.get(dsId));
-                    break;
-                }
-                case DATASOURCE_DELETED: {
+                case DATASOURCE_DELETED -> {
                     WebDataSourceUtils.disconnectDataSource(this, ds);
-                    if (registry instanceof DBPDataSourceRegistryCache) {
-                        ((DBPDataSourceRegistryCache) registry).removeDataSourceFromList(ds);
+                    if (registry instanceof DBPDataSourceRegistryCache dsrc) {
+                        dsrc.removeDataSourceFromList(ds);
                     }
-                    this.connections.remove(ds.getId());
+                    this.connections.remove(getConnectionId(ds));
                     sendDataSourceUpdatedEvent = true;
-                    break;
                 }
-                default: {
-                    break;
+                default -> {
                 }
             }
         }
         return sendDataSourceUpdatedEvent;
     }
 
+    @NotNull
+    private String getConnectionId(@NotNull DBPDataSourceContainer container) {
+        return getConnectionId(container.getProject().getId(), container.getId());
+    }
+
+    @NotNull
+    private String getConnectionId(@NotNull String projectId, @NotNull String dsId) {
+        return projectId + ":" + dsId;
+    }
+
     // Note: for admin use only
     public synchronized void resetUserState() throws DBException {
         clearAuthTokens();
@@ -311,6 +323,7 @@ public class WebSession extends BaseWebSession
             log.error(e);
         }
         refreshUserData();
+        clearSessionContext();
     }
 
     private void initNavigatorModel() {
@@ -470,7 +483,7 @@ public class WebSession extends BaseWebSession
         var registry = getProjectById(WebAppUtils.getGlobalProjectId()).getDataSourceRegistry();
         var dataSource = registry.getDataSource(dsId);
         if (dataSource != null) {
-            connections.put(dsId, new WebConnectionInfo(this, dataSource));
+            connections.put(getConnectionId(dataSource), new WebConnectionInfo(this, dataSource));
             // reflect changes is navigator model
             registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_ADD, dataSource, true));
         }
@@ -481,7 +494,7 @@ public class WebSession extends BaseWebSession
         var dataSource = registry.getDataSource(dsId);
         if (dataSource != null) {
             this.accessibleConnectionIds.remove(dsId);
-            connections.remove(dsId);
+            connections.remove(getConnectionId(dataSource));
             // reflect changes is navigator model
             registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_REMOVE, dataSource));
             dataSource.dispose();
@@ -522,16 +535,10 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    public synchronized void updateInfo(
-        HttpServletRequest request,
-        HttpServletResponse response
-    ) throws DBWebException {
+    public synchronized void updateInfo(boolean isOldHttpSessionUsed) {
+        log.debug("Update session lifetime " + getSessionId() + " for user " + getUserId());
         touchSession();
-        HttpSession httpSession = request.getSession();
-        this.lastRemoteAddr = request.getRemoteAddr();
-        this.lastRemoteUserAgent = request.getHeader("User-Agent");
-        this.cacheExpired = false;
-        if (!httpSession.isNew()) {
+        if (isOldHttpSessionUsed) {
             try {
                 // Persist session
                 if (!isAuthorizedInSecurityManager()) {
@@ -551,6 +558,12 @@ public class WebSession extends BaseWebSession
         }
     }
 
+    public synchronized void updateSessionParameters(HttpServletRequest request) {
+        this.lastRemoteAddr = request.getRemoteAddr();
+        this.lastRemoteUserAgent = request.getHeader("User-Agent");
+        this.cacheExpired = false;
+    }
+
     @Association
     public List<WebConnectionInfo> getConnections() {
         synchronized (connections) {
@@ -560,9 +573,21 @@ public class WebSession extends BaseWebSession
 
     @NotNull
     public WebConnectionInfo getWebConnectionInfo(@Nullable String projectId, String connectionID) throws DBWebException {
-        WebConnectionInfo connectionInfo;
+        WebConnectionInfo connectionInfo = null;
         synchronized (connections) {
-            connectionInfo = connections.get(connectionID);
+            if (projectId != null) {
+                connectionInfo = connections.get(getConnectionId(projectId, connectionID));
+            } else {
+                addWarningMessage("Project id is not defined in request. Try to find it from connection cache");
+                for (Map.Entry<String, WebConnectionInfo> entry : connections.entrySet()) {
+                    String k = entry.getKey();
+                    WebConnectionInfo v = entry.getValue();
+                    if (k.contains(connectionID)) {
+                        connectionInfo = v;
+                        break;
+                    }
+                }
+            }
         }
         if (connectionInfo == null) {
             WebProjectImpl project = getProjectById(projectId);
@@ -573,7 +598,7 @@ public class WebSession extends BaseWebSession
             if (dataSource != null) {
                 connectionInfo = new WebConnectionInfo(this, dataSource);
                 synchronized (connections) {
-                    connections.put(connectionID, connectionInfo);
+                    connections.put(getConnectionId(dataSource), connectionInfo);
                 }
             } else {
                 throw new DBWebException("Connection '" + connectionID + "' not found");
@@ -583,22 +608,22 @@ public class WebSession extends BaseWebSession
     }
 
     @Nullable
-    public WebConnectionInfo findWebConnectionInfo(String connectionID) {
+    public WebConnectionInfo findWebConnectionInfo(String projectId, String connectionId) {
         synchronized (connections) {
-            return connections.get(connectionID);
+            return connections.get(getConnectionId(projectId, connectionId));
         }
     }
 
     public void addConnection(WebConnectionInfo connectionInfo) {
         synchronized (connections) {
-            connections.put(connectionInfo.getId(), connectionInfo);
+            connections.put(getConnectionId(connectionInfo.getDataSourceContainer()), connectionInfo);
         }
     }
 
     public void removeConnection(WebConnectionInfo connectionInfo) {
         connectionInfo.clearCache();
         synchronized (connections) {
-            connections.remove(connectionInfo.getId());
+            connections.remove(getConnectionId(connectionInfo.getDataSourceContainer()));
         }
     }
 
@@ -619,7 +644,26 @@ public class WebSession extends BaseWebSession
         super.close();
     }
 
-    private void clearAuthTokens() throws DBException {
+    @Override
+    public void close(boolean clearTokens) {
+        try {
+            resetNavigationModel();
+            resetSessionCache();
+        } catch (Throwable e) {
+            log.error(e);
+        }
+        if (clearTokens) {
+            try {
+                clearAuthTokens();
+            } catch (Exception e) {
+                log.error("Error closing web session tokens");
+            }
+        }
+        this.userContext.setUser(null);
+        super.close(clearTokens);
+    }
+
+    private List<WebAuthInfo> clearAuthTokens() throws DBException {
         ArrayList<WebAuthInfo> tokensCopy;
         synchronized (authTokens) {
             tokensCopy = new ArrayList<>(this.authTokens);
@@ -628,6 +672,7 @@ public class WebSession extends BaseWebSession
             removeAuthInfo(ai);
         }
         resetAuthToken();
+        return tokensCopy;
     }
 
     public DBRProgressMonitor getProgressMonitor() {
@@ -764,8 +809,8 @@ public class WebSession extends BaseWebSession
     public <T> T getAttribute(String name) {
         synchronized (attributes) {
             Object value = attributes.get(name);
-            if (value instanceof PersistentAttribute) {
-                value = ((PersistentAttribute) value).getValue();
+            if (value instanceof PersistentAttribute persistentAttribute) {
+                value = persistentAttribute.getValue();
             }
             return (T) value;
         }
@@ -780,8 +825,8 @@ public class WebSession extends BaseWebSession
     public <T> T getAttribute(String name, Function<T, T> creator, Function<T, T> disposer) {
         synchronized (attributes) {
             Object value = attributes.get(name);
-            if (value instanceof PersistentAttribute) {
-                value = ((PersistentAttribute) value).getValue();
+            if (value instanceof PersistentAttribute persistentAttribute) {
+                value = persistentAttribute.getValue();
             }
             if (value == null) {
                 value = creator.apply(null);
@@ -817,6 +862,14 @@ public class WebSession extends BaseWebSession
         }
     }
 
+    @Override
+    public List<SMAuthInfo> getAuthInfos() {
+        synchronized (authTokens) {
+            return authTokens.stream().map(WebAuthInfo::getAuthInfo).toList();
+        }
+    }
+
+
     public List<WebAuthInfo> getAllAuthInfo() {
         synchronized (authTokens) {
             return new ArrayList<>(authTokens);
@@ -878,18 +931,23 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    public void removeAuthInfo(String providerId) throws DBException {
+    public List<WebAuthInfo> removeAuthInfo(String providerId) throws DBException {
+        List<WebAuthInfo> oldInfo;
         if (providerId == null) {
-            clearAuthTokens();
+            oldInfo = clearAuthTokens();
         } else {
             WebAuthInfo authInfo = getAuthInfo(providerId);
             if (authInfo != null) {
                 removeAuthInfo(authInfo);
+                oldInfo = List.of(authInfo);
+            } else {
+                oldInfo = List.of();
             }
         }
         if (authTokens.isEmpty()) {
             resetUserState();
         }
+        return oldInfo;
     }
 
     public List<DBACredentialsProvider> getContextCredentialsProviders() {
@@ -909,8 +967,9 @@ public class WebSession extends BaseWebSession
             for (DBACredentialsProvider contextCredentialsProvider : getContextCredentialsProviders()) {
                 contextCredentialsProvider.provideAuthParameters(monitor, dataSourceContainer, configuration);
             }
+            configuration.setRuntimeAttribute(RUNTIME_PARAM_AUTH_INFOS, getAllAuthInfo());
 
-            WebConnectionInfo webConnectionInfo = findWebConnectionInfo(dataSourceContainer.getId());
+            WebConnectionInfo webConnectionInfo = findWebConnectionInfo(dataSourceContainer.getProject().getId(), dataSourceContainer.getId());
             if (webConnectionInfo != null) {
                 WebDataSourceUtils.saveCredentialsInDataSource(webConnectionInfo, dataSourceContainer, configuration);
             }
@@ -926,7 +985,7 @@ public class WebSession extends BaseWebSession
                 .create();
 
             credGson.fromJson(credGson.toJsonTree(configuration.getAuthProperties()), credentials.getClass());
-            configuration.getAuthModel().saveCredentials(dataSourceContainer, configuration, credentials);
+            configuration.getAuthModel().provideCredentials(dataSourceContainer, configuration, credentials);
         } catch (DBException e) {
             addSessionError(e);
             log.error(e);
@@ -965,9 +1024,7 @@ public class WebSession extends BaseWebSession
 
     private <T> boolean isAuthInfoInstanceOf(WebAuthInfo authInfo, Class<T> adapter) {
         if (authInfo != null && authInfo.getAuthSession() != null) {
-            if (adapter.isInstance(authInfo.getAuthSession())) {
-                return true;
-            }
+            return adapter.isInstance(authInfo.getAuthSession());
         }
         return false;
     }
@@ -1009,6 +1066,17 @@ public class WebSession extends BaseWebSession
         return getWorkspace().getProjectById(projectId);
     }
 
+    public WebProjectImpl getAccessibleProjectById(@Nullable String projectId) throws DBWebException {
+        WebProjectImpl project = null;
+        if (projectId != null) {
+            project = getWorkspace().getProjectById(projectId);
+        }
+        if (project == null) {
+            throw new DBWebException("Project not found: " + projectId);
+        }
+        return project;
+    }
+
     public List<WebProjectImpl> getAccessibleProjects() {
         return getWorkspace().getProjects();
     }
@@ -1060,6 +1128,11 @@ public class WebSession extends BaseWebSession
         return project.getFileSystemManager();
     }
 
+    @NotNull
+    public DBPPreferenceStore getUserPreferenceStore() {
+        return getUserContext().getPreferenceStore();
+    }
+
     private class SessionProgressMonitor extends BaseProgressMonitor {
         @Override
         public void beginTask(String name, int totalWork) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -164,6 +164,7 @@ public class WebSessionAuthProcessor {
                     authProviderDescriptor,
                     userIdentity,
                     authSession,
+                    authInfo,
                     OffsetDateTime.now()
                 );
                 webAuthInfo.setAuthProviderConfigurationId(authConfiguration.getAuthProviderConfigurationId());

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionEventsFilter.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -18,8 +18,8 @@ package io.cloudbeaver.model.session;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.websocket.event.WSProjectResourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.WSEvent;
+import org.jkiss.dbeaver.model.websocket.event.WSProjectResourceEvent;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionPreferenceStore.java

@@ -0,0 +1,72 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.session;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.impl.preferences.AbstractUserPreferenceStore;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class WebSessionPreferenceStore extends AbstractUserPreferenceStore {
+    public WebSessionPreferenceStore(
+        @NotNull DBPPreferenceStore parentStore
+    ) {
+        super(parentStore);
+    }
+
+    @NotNull
+    public Map<String, Object> getCustomUserParameters() {
+        return userPreferences;
+    }
+
+    // to avoid redundant sm api call
+    public void updatePreferenceValues(@NotNull Map<String, Object> newValues) {
+        userPreferences.putAll(newValues);
+    }
+
+    @Override
+    protected void setUserPreference(String name, Object value) {
+        throw new RuntimeException("Not implemented");
+    }
+
+    @Override
+    public String getDefaultString(String name) {
+        return parentStore.getDefaultString(name);
+    }
+
+    @Override
+    public boolean isDefault(String name) {
+        return !userPreferences.containsKey(name) && parentStore.isDefault(name);
+    }
+
+    @Override
+    public boolean needsSaving() {
+        return false;
+    }
+
+    @Override
+    public void setToDefault(String name) {
+        throw new RuntimeException("Not implemented");
+    }
+
+    @Override
+    public void save() throws IOException {
+        throw new RuntimeException("Not implemented");
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionProvider.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -22,7 +22,6 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.rm.RMUtils;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -86,11 +85,13 @@ public class WebSessionWorkspace implements DBPWorkspace {
         return accessibleProjects;
     }
 
+    @Nullable
     @Override
     public DBPProject getActiveProject() {
         return activeProject;
     }
 
+    @Nullable
     @Override
     public WebProjectImpl getProject(@NotNull String projectName) {
         for (WebProjectImpl project : accessibleProjects) {
@@ -103,7 +104,7 @@ public class WebSessionWorkspace implements DBPWorkspace {
 
     @Nullable
     @Override
-    public WebProjectImpl getProjectById(String projectId) {
+    public WebProjectImpl getProjectById(@NotNull String projectId) {
         if (projectId == null) {
             return activeProject;
         }
@@ -117,21 +118,15 @@ public class WebSessionWorkspace implements DBPWorkspace {
 
     @NotNull
     @Override
-    public SMSessionContext getAuthContext() {
+    public SessionContextImpl getAuthContext() {
         return workspaceAuthContext;
     }
 
     @Override
     public void dispose() {
-        clearAuthData();
-
         clearProjects();
     }
 
-    void clearAuthData() {
-        workspaceAuthContext.close();
-    }
-
     public void setActiveProject(DBPProject activeProject) {
         this.activeProject = (WebProjectImpl) activeProject;
     }
@@ -155,12 +150,12 @@ public class WebSessionWorkspace implements DBPWorkspace {
     }
 
     @Override
-    public boolean hasRealmPermission(String permission) {
+    public boolean hasRealmPermission(@NotNull String permission) {
         return false;
     }
 
     @Override
-    public boolean supportsRealmFeature(String feature) {
+    public boolean supportsRealmFeature(@NotNull String feature) {
         return false;
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.
@@ -36,12 +36,10 @@ import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.security.SMController;
 import org.jkiss.dbeaver.model.security.user.SMAuthPermissions;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.utils.CommonUtils;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -66,6 +64,7 @@ public class WebUserContext implements SMCredentialsProvider {
     private RMController rmController;
     private DBFileController fileController;
     private Set<String> accessibleProjectIds = new HashSet<>();
+    private final WebSessionPreferenceStore preferenceStore;
 
     public WebUserContext(WebApplication application, DBPWorkspace workspace) throws DBException {
         this.application = application;
@@ -73,6 +72,7 @@ public class WebUserContext implements SMCredentialsProvider {
         this.securityController = application.createSecurityController(this);
         this.rmController = application.createResourceController(this, workspace);
         this.fileController = application.createFileController(this);
+        this.preferenceStore = new WebSessionPreferenceStore(DBWorkbench.getPlatform().getPreferenceStore());
         setUserPermissions(getDefaultPermissions());
     }
 
@@ -116,7 +116,13 @@ public class WebUserContext implements SMCredentialsProvider {
         setRefreshToken(smRefreshToken);
         setUserPermissions(smAuthPermissions.getPermissions());
         this.adminSecurityController = application.getAdminSecurityController(this);
+        this.rmController = application.createResourceController(this, workspace);
         if (isSessionChanged) {
+            if (smAuthPermissions.getUserId() != null) {
+                this.preferenceStore.updateAllUserPreferences(securityController.getCurrentUserParameters());
+            } else {
+                this.preferenceStore.updateAllUserPreferences(Map.of());
+            }
             this.smSessionId = smAuthPermissions.getSessionId();
             setUser(smAuthPermissions.getUserId() == null ? null : new WebUser(securityController.getCurrentUser()));
             refreshAccessibleProjects();
@@ -161,7 +167,7 @@ public class WebUserContext implements SMCredentialsProvider {
         this.user = null;
         this.securityController = application.createSecurityController(this);
         this.adminSecurityController = null;
-        this.secretController = application.getSecretController(this);
+        this.secretController = null;
     }
 
     @NotNull
@@ -220,7 +226,10 @@ public class WebUserContext implements SMCredentialsProvider {
         this.userPermissions = permissions;
     }
 
-    public DBSSecretController getSecretController() {
+    public DBSSecretController getSecretController() throws DBException {
+        if (this.securityController == null) {
+            this.secretController = application.getSecretController(this, workspace.getAuthContext());
+        }
         return secretController;
     }
 
@@ -248,4 +257,8 @@ public class WebUserContext implements SMCredentialsProvider {
     private void setRefreshToken(@Nullable String refreshToken) {
         this.refreshToken = refreshToken;
     }
+
+    public WebSessionPreferenceStore getPreferenceStore() {
+        return preferenceStore;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 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.