Cb 3470 hotfix (#1781)

* CB-3470 sql query fix

.github/workflows/commit-msgs-validator.yml

@@ -0,0 +1,17 @@
+name: "Commit Message Validation"
+
+on:
+  pull_request:
+    branches:
+      - devel
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - edited
+      - ready_for_review
+      - labeled
+      
+jobs:
+  validate-commit-message:
+    uses: dbeaver/dbeaver/.github/workflows/reused-commit-msgs-validator.yml@devel

.github/workflows/jest-tests-runner.yml

@@ -0,0 +1,32 @@
+name: Run Jest Tests
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "devel" branch
+  pull_request:
+    branches: [ "devel" ]
+    paths:
+      - 'webapp/**' # monitor for the frontend changes
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  run-jest-tests:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./webapp
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+     - uses: actions/checkout@v3
+     - uses: actions/setup-node@v3
+       with:
+        node-version: '18'
+     - run: npm install yarn -g
+     - run: yarn
+     - run: yarn lerna bootstrap
+     - run: yarn lerna run test

.gitignore

@@ -16,14 +16,10 @@
 *.ear
 *.rar
 
-# editor files
-.vscode
-
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 # web
-/sources/web/node_modules/
 dist/
 
 ## IDEA configs
@@ -32,6 +28,12 @@ dist/
 /idea/
 .idea/
 
+## Mac OS
+.DS_Store
+
+## tests
+server/test/io.cloudbeaver.test.platform/workspace/.data/
+
 ## Eclipse configs
 
 .project
@@ -40,3 +42,4 @@ dist/
 
 deploy/cloudbeaver
 server/**/target
+apps/**/target

.vscode/extensions.json

@@ -0,0 +1,24 @@
+{
+  "recommendations": [
+    "shengchen.vscode-checkstyle",
+    "vscjava.vscode-java-pack",
+    "yaozheng.vscode-pde",
+    "arcanis.vscode-zipfs",
+    "dbaeumer.vscode-eslint",
+    "ecmel.vscode-html-css",
+    "GraphQL.vscode-graphql",
+    "ms-vscode.js-debug",
+    "ms-vscode.vscode-js-profile-table",
+    "rangav.vscode-thunder-client",
+    "redhat.vscode-xml",
+    "redhat.vscode-yaml",
+    "streetsidesoftware.code-spell-checker",
+    "streetsidesoftware.code-spell-checker-russian",
+    "syler.sass-indented",
+    "VisualStudioExptTeam.intellicode-api-usage-examples",
+    "VisualStudioExptTeam.vscodeintellicode",
+    "yzhang.markdown-all-in-one",
+    "GraphQL.vscode-graphql-syntax",
+    "mrmlnc.vscode-json5"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,85 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "Debug CE",
+      "url": "http://127.0.0.1:3100",
+      "webRoot": "${workspaceFolder}/webapp/packages/product-default"
+    },
+    {
+      "type": "java",
+      "name": "CloudBeaver CE",
+      "cwd": "${workspaceFolder}/../opt/cbce",
+      "request": "launch",
+      "mainClass": "org.eclipse.equinox.launcher.Main",
+      "classPaths": [
+        "${env:DBEAVER_DEVEL_ECLIPSE_PATH}/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar"
+      ],
+      "windows": {
+        "type": "java",
+        "name": "CloudBeaver CE",
+        "request": "launch",
+        "mainClass": "org.eclipse.equinox.launcher.Main",
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "-os",
+          "win32",
+          "-ws",
+          "win32",
+          "-arch",
+          "x86_64",
+          "-nl",
+          "en",
+          "-showsplash",
+          "-web-config",
+          "conf/cloudbeaver.conf"
+        ],
+        "vmArgs": [
+          "-XX:+IgnoreUnrecognizedVMOptions",
+          "--add-modules=ALL-SYSTEM",
+          "-Xms64m",
+          "-Xmx1024m",
+          "-Declipse.pde.launch=true"
+        ]
+      },
+      "osx": {
+        "type": "java",
+        "name": "CloudBeaver CE",
+        "request": "launch",
+        "mainClass": "org.eclipse.equinox.launcher.Main",
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "-os",
+          "macosx",
+          "-ws",
+          "cocoa",
+          "-arch",
+          "aarch64",
+          "-nl",
+          "en_US",
+          "-showsplash"
+        ],
+        "vmArgs": [
+          "-XX:+IgnoreUnrecognizedVMOptions",
+          "--add-modules=ALL-SYSTEM",
+          "-Xms64m",
+          "-Xmx1024m",
+          "-Declipse.pde.launch=true",
+          "-XstartOnFirstThread"
+        ]
+      }
+    }
+  ]
+}

.vscode/license.code-snippets

@@ -0,0 +1,17 @@
+{
+  "license": {
+    "scope": "typescript,typescriptreact,javascript,javascriptreact",
+    "prefix": "license",
+    "body": [
+      "/*",
+      " * CloudBeaver - Cloud Database Manager",
+      " * Copyright (C) 2020-2023 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/settings.json

@@ -0,0 +1,50 @@
+{
+  "editor.tabSize": 2,
+  "editor.formatOnSave": true,
+
+  "task.autoDetect": "off",
+
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable",
+  "java.compile.nullAnalysis.mode": "automatic",
+
+  "typescript.preferences.importModuleSpecifier": "relative",
+  "typescript.preferences.includePackageJsonAutoImports": "on",
+  "typescript.preferences.quoteStyle": "single",
+  "typescript.tsdk": "webapp/node_modules/typescript/lib",
+
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.packageManager": "yarn",
+  "eslint.workingDirectories": ["webapp"],
+
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[java]": {
+    "editor.defaultFormatter": "redhat.java"
+  },
+
+  "files.eol": "\n",
+  "files.associations": {
+    "*.css": "postcss"
+  },
+
+  "java.checkstyle.configuration": "${workspaceFolder}/../dbeaver/dbeaver-checkstyle-config.xml",
+  "java.checkstyle.version": "10.12.0"
+}

.vscode/tasks.json

@@ -0,0 +1,92 @@
+{
+  "version": "2.0.0",
+  "problemMatcher": [],
+  "presentation": {
+    "clear": true
+  },
+  "options": {
+    "cwd": "${workspaceFolder}/webapp",
+    "env": {
+      "NODE_OPTIONS": "--max-old-space-size=8192",
+      "MAVEN_OPTS": "-Xmx8192m"
+    }
+  },
+  "tasks": [
+    {
+      "label": "Generate dev proprties for CBCE",
+      "type": "shell",
+      "command": "mvn",
+      "args": [
+        "package",
+        "-q",
+        "exec:java",
+        "-Dexec.args=-productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${env:DBEAVER_DEVEL_ECLIPSE_PATH} -output ${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/../dbeaver-packaging/tools/eclipse-plugins-resolver"
+      }
+    },
+    {
+      "label": "Run Tests",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"]
+    },
+    {
+      "label": "Run DevServer CE",
+      "type": "shell",
+      "command": "yarn",
+      "args": [
+        "dev",
+        "--",
+        "--env",
+        "server=${input:stage.ce}",
+        "--host",
+        "0.0.0.0"
+      ],
+      "isBackground": true,
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/packages/product-default"
+      }
+    },
+    {
+      "label": "Build CE",
+      "type": "shell",
+      "command": "./build-sqlite.bat",
+      "options": {
+        "cwd": "${workspaceFolder}/deploy"
+      },
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "Yarn Install",
+      "type": "shell",
+      "command": "yarn",
+      "args": []
+    },
+    {
+      "label": "Lerna Bootstrap",
+      "type": "shell",
+      "command": "yarn",
+      "args": ["lerna", "bootstrap"]
+    },
+    {
+      "label": "Bootstrap",
+      "dependsOrder": "sequence",
+      "dependsOn": ["Yarn Install", "Lerna Bootstrap"]
+    }
+  ],
+  "inputs": [
+    {
+      "type": "pickString",
+      "id": "stage.ce",
+      "description": "CE Stage servers",
+      "default": "http://127.0.0.1:8978/",
+      "options": ["http://127.0.0.1:8978/"]
+    }
+  ]
+}

README.md

@@ -9,12 +9,10 @@ See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 
 ![](https://github.com/dbeaver/cloudbeaver/wiki/images/demo_screenshot_1.png)
 
-## Build CloudBeaver
+## Run in Docker
 
-CloudBeaver is the multi-platform server side application.
-It can run on Linux, Windows and MacOS X.
-
-[Detailed instructions](https://github.com/dbeaver/cloudbeaver/wiki/Build-and-deploy)
+- [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
+- [Running instructions](https://github.com/dbeaver/cloudbeaver/wiki/Run-Docker-Container)
 
 ## Demo server
 
@@ -24,41 +22,30 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 
 ## Changelog
 
-### CloudBeaver 1.1.0 - 2020-07-14
+### CloudBeaver 23.1.0 - 2023-06-05
 
-- Connection management and authentication redesign
-- Webpack build minimization
-- A lot of minor UI improvements
-- Many minor UI improvements
+Changes since 23.0.0
 
-### CloudBeaver 1.0.4 - 2020-06-16
+- Data viewer:
+  - New grouping panel menu was added in the Data Viewer. This panel extracts unique values from the database column for count. Users can drag and drop the column to the grouping panel and get the results immediately. Sorting, filtering and exporting of the results are available on the Grouping panel. 
+- SQL Editor:
+  - We improved the performance of the SQL-editor - as a result, handling scripts with up to 10 000 lines does not present any challenges;
+  - In the SQL-editor, pressing Tab/Space followed by Enter now causes the cursor to move to a new line;
+  - In the SQL editor, when the cursor goes back on the query, the previous hints are displayed;
+  - Error when running SQL with semicolon has been fixed.
+- Connections:
+  - If there is an error in saving the data, the tab for the chosen connection dialog will stay open to allow corrections;
+  - The URL-configuration for PostgreSQL now correctly displays only a single database.
+- Driver management:
+  - The CE version now offers the updated sqlite-jdbc driver, version 3.41.2;
+  - CloudBeaver has the option to connect to H2 database version 2;
+  - The internal CloudBeaver database is upgraded to the newest H2 version 2 to avoid vulnerability issues. The database will be safely upgraded automatically for the servers with default configurations. You can perform this upgrade manually if you have a custom configuration for this database in your infrastructure.
+- Connections:
+  - Option to increase the maximum size of text files displayed in the value panel (using the sqlTextPreviewMaxLength parameter) has been added;
+  - Support for custom logging configuration has been added. An external configuration file can be used instead of the default configuration.
 
-- Database navigator refresh
-- Data viewer: filters support
-- Many minor UI improvements
 
-### CloudBeaver 1.0.3 - 2020-06-02
+### Old CloudBeaver releases
 
-- Administrative panel
-- User management
-- Authentication model redesign
-- Build artifacts minimization
-- Many minor UI improvements
+You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
 
-### CloudBeaver 1.0.2 - 2020-05-19
-
-- Data export feature UI was improved
-- User authentication and permission management
-- Driver management was redesigned
-- Clickhouse driver was added
-- Build procedure was redesigned
-- Many minor bugfixes
-
-### CloudBeaver 1.0.1 - 2020-05-05
-
-- Data export feature added to the data viewer
-- H2 embedded database driver was added
-- User authentication API was added
-- Product configuration framework and API was added
-- Embedded database for user management was added
-- Many minor bugfixes

SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported         |
+| ------- | ------------------|
+| 21.x   | yes                |
+| 22.0   | yes                |
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities to devops@dbeaver.com.    
+You will receive a response from us within 48 hours.    
+If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days.

apps/h2-query-executor/README.md

@@ -0,0 +1,27 @@
+# H2 Query Executor
+
+Applications for executing h2 database queries through the console and running queries to fix the CloudBeaver database
+
+## How to build
+
+Use mvn clean install to build executable jar.
+
+## Arguments:
+
+**--db-path** - path to cloudbeaver database
+
+**--db-user** - cloudbeaver database username
+
+**--db-password-path** - path to .database.credentials.dat
+
+**--db-password** - database password(use only password or db-password-path, not both)
+
+**--db-custom-query** - execute custom sql query
+
+**--db-execute-11-migration-fix** - mark that scripts to fix broken migration must be executed
+
+## Example:
+
+java -jar h2-query-executor-1.0.0.jar --db-path=/var/cloudbeaver/workspace/.data/cb.h2.dat.mv.db --db-user=cb-data
+--db-password-path=/var/cloudbeaver/workspace/.data/.database-credentials.dat --db-custom-query="show tables"
+

apps/h2-query-executor/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.cloudbeaver</groupId>
+    <artifactId>h2-query-executor</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.199</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>
+                                io.cloudbeaver.H2ExecutorConsoleApplication
+                            </mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>assemble-all</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,26 +16,18 @@
  */
 package io.cloudbeaver;
 
-public enum DBWSecuritySubjectType {
-    user("U"),
-    role("R");
+import java.util.HashMap;
+import java.util.Map;
 
-    private final String code;
-
-    DBWSecuritySubjectType(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public static DBWSecuritySubjectType fromCode(String code) {
-        for (DBWSecuritySubjectType st : values()) {
-            if (st.code.equals(code)) {
-                return st;
-            }
+public class ArgsParser {
+    public static Map<String, String> parseArgs(String[] args) {
+        var result = new HashMap<String, String>();
+        for (String arg : args) {
+            var keyValue = arg.split("=");
+            var key = keyValue[0].replaceAll("--", "");
+            var value = keyValue.length > 1 ? keyValue[1] : null;
+            result.put(key, value);
         }
-        throw new IllegalArgumentException("Bad subject type code: " + code);
+        return result;
     }
 }

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

@@ -0,0 +1,76 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Properties;
+
+public class H2ExecutorConsoleApplication {
+    private static final String ARG_DB_PATH = "db-path";
+    private static final String ARG_DB_USER = "db-user";
+    private static final String ARG_DB_PASSWORD = "db-password";
+    private static final String ARG_DB_PASSWORD_PATH = "db-password-path";
+    private static final String ARG_DB_CUSTOM_QUERY = "db-custom-query";
+    private static final String ARG_EXECUTE_11_MIGRATION_FIX = "db-execute-11-migration-fix";
+
+    public static void main(String[] args) throws Exception {
+        var parsedArgs = ArgsParser.parseArgs(args);
+        var dbPath = validateAndGetValue(ARG_DB_PATH, parsedArgs);
+        var dbUser = validateAndGetValue(ARG_DB_USER, parsedArgs);
+        String dbPassword = null;
+        if (parsedArgs.containsKey(ARG_DB_PASSWORD)) {
+            dbPassword = validateAndGetValue(ARG_DB_PASSWORD, parsedArgs);
+        } else if (parsedArgs.containsKey(ARG_DB_PASSWORD_PATH)) {
+            var dbPasswordFilePath = validateAndGetValue(ARG_DB_PASSWORD_PATH, parsedArgs);
+            dbPassword = Files.readString(Path.of(dbPasswordFilePath));
+        }
+
+        if (dbPassword == null) {
+            throw new RuntimeException("Database password not specified");
+        }
+
+        var dbUrl = "jdbc:h2:file:" + dbPath.replaceAll(".mv.db", "");
+        var props = new Properties();
+        props.put("user", dbUser);
+        props.put("password", dbPassword);
+
+        var executor = new H2QueryExecutor(dbUrl, props);
+        process(executor, parsedArgs);
+    }
+
+    private static String validateAndGetValue(String argName, Map<String, String> ars) {
+        String argValue = ars.get(argName);
+        if (argValue == null) {
+            throw new RuntimeException(argName + " parameter not specified");
+        }
+        return argValue;
+    }
+
+    public static void process(H2QueryExecutor executor, Map<String, String> args) throws Exception {
+        if (args.containsKey(ARG_DB_CUSTOM_QUERY)) {
+            var customQuery = validateAndGetValue(ARG_DB_CUSTOM_QUERY, args);
+            executor.executeQuery(customQuery);
+        }
+
+        if (args.containsKey(ARG_EXECUTE_11_MIGRATION_FIX)) {
+            System.out.println("Start to execute migration fix");
+            executor.execute11MigrationFix();
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class H2QueryExecutor {
+    private final String dbUrl;
+    private final Properties dbProperties;
+
+    public H2QueryExecutor(String dbUrl, Properties dbProperties) {
+        this.dbUrl = dbUrl;
+        this.dbProperties = dbProperties;
+    }
+
+
+    public void executeQuery(String query) throws SQLException, ClassNotFoundException {
+        System.out.println("Execute query: " + query);
+
+        try (
+            var connection = DriverManager.getConnection(dbUrl, dbProperties);
+            var statement = connection.createStatement()
+        ) {
+            statement.execute(query);
+            var result = statement.getResultSet();
+            if (result == null) {
+                return;
+            }
+            var meta = result.getMetaData();
+            while (result.next()) {
+                for (var i = 1; i <= meta.getColumnCount(); i++) {
+                    var className = meta.getColumnClassName(i);
+                    var clazz = Class.forName(className);
+                    System.out.print(result.getObject(i, clazz) + " ");
+                }
+                System.out.println();
+            }
+        }
+    }
+
+    public void execute11MigrationFix() throws SQLException, ClassNotFoundException {
+        var queries = SqlConsts.fix11MigrationQueries.split(";");
+        for (String query : queries) {
+            executeQuery(query);
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+public class SqlConsts {
+    public static final String fix11MigrationQueries = "" +
+        "CREATE TABLE CB_USER_TEAM\n" +
+        "(\n" +
+        "    USER_ID    VARCHAR(128) NOT NULL,\n" +
+        "    TEAM_ID    VARCHAR(128) NOT NULL,\n" +
+        "\n" +
+        "    GRANT_TIME TIMESTAMP    NOT NULL,\n" +
+        "    GRANTED_BY VARCHAR(128) NOT NULL,\n" +
+        "\n" +
+        "    PRIMARY KEY (USER_ID, TEAM_ID),\n" +
+        "    FOREIGN KEY (USER_ID) REFERENCES CB_USER (USER_ID) ON DELETE CASCADE,\n" +
+        "    FOREIGN KEY (TEAM_ID) REFERENCES CB_TEAM (TEAM_ID) ON DELETE NO ACTION\n" +
+        ");\n" +
+        "\n" +
+        "INSERT INTO CB_USER_TEAM (USER_ID, TEAM_ID, GRANT_TIME, GRANTED_BY)\n" +
+        "SELECT USER_ID, ROLE_ID, GRANT_TIME, GRANTED_BY FROM CB_USER_ROLE;\n" +
+        "\n" +
+        "CREATE TABLE CB_EXTERNAL_TEAM\n" +
+        "(\n" +
+        "    TEAM_ID          VARCHAR(128) NOT NULL,\n" +
+        "    EXTERNAL_TEAM_ID VARCHAR(128) NOT NULL,\n" +
+        "\n" +
+        "    PRIMARY KEY (TEAM_ID,EXTERNAL_TEAM_ID),\n" +
+        "    FOREIGN KEY (TEAM_ID) REFERENCES CB_TEAM (TEAM_ID) ON DELETE CASCADE\n" +
+        ");\n" +
+        "\n" +
+        "DROP TABLE CB_USER_ROLE;\n" +
+        "DROP TABLE CB_ROLE;\n" +
+        "\n" +
+        "\n" +
+        "DELETE FROM CB_SCHEMA_INFO where VERSION > 0;\n" +
+        "INSERT INTO CB_SCHEMA_INFO (VERSION,UPDATE_TIME) VALUES(11,CURRENT_TIMESTAMP)\n" +
+        "\n";
+}

config/core/initial-data.conf

@@ -0,0 +1,16 @@
+{
+    teams: [
+        {
+            subjectId: "admin",
+            name: "Admin",
+            description: "Administrative access. Has all permissions.",
+            permissions: [ "admin" ]
+        },
+        {
+            subjectId: "user",
+            name: "User",
+            description: "Standard user",
+            permissions: [ ]
+        }
+    ]
+}

config/core/logback.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <!-- Disable logback status messages -->
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+    <logger name="org.jkiss" level="DEBUG"/>
+    <logger name="io.cloudbeaver" level="DEBUG"/>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+</configuration>

config/core/product.conf

@@ -16,10 +16,19 @@
                 maxLogRecords: 2000,
                 maxFailedRequests: 3
             }
+        },
+        authentication: {
+            primaryAuthProvider: 'local'
         }
     },
     // Notifications config
     core_events: {
         notificationsPool: 5
+    },
+    plugin_data_spreadsheet_new: {
+        hidden: false
+    },
+    plugin_data_export: {
+        disabled: false
     }
 }

config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json

@@ -0,0 +1,24 @@
+{
+	"folders": {},
+	"connections": {
+		"postgresql-template-1": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "PostgreSQL (Template)",
+			"save-password": false,
+			"show-system-objects": false,
+			"read-only": true,
+			"template": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "postgres",
+				"url": "jdbc:postgresql://localhost:5432/postgres",
+				"type": "dev",
+				"provider-properties": {
+					"@dbeaver-show-non-default-db@": "false"
+				}
+			}
+		}
+	}
+}

config/sample-databases/DefaultConfiguration/cloudbeaver.conf

@@ -0,0 +1,69 @@
+{
+    server: {
+        serverPort: 8978,
+
+        workspaceLocation: "workspace",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        rootURI: "/",
+        serviceURI: "/api/",
+
+        productConfiguration: "conf/product.conf",
+
+        expireSessionAfterPeriod: 1800000,
+
+        develMode: false,
+
+        enableSecurityManager: false,
+
+        database: {
+            driver="h2_embedded_v2",
+            url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
+            initialDataConfiguration: "conf/initial-data.conf",
+            pool: {
+                minIdleConnections: 4,
+                maxIdleConnections: 10,
+                maxConnections: 100,
+                validationQuery: "SELECT 1"
+            }
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: true,
+        anonymousUserRole: "user",
+        grantConnectionsAccessToAnonymousTeam: false,
+        supportsCustomConnections: false,
+        showReadOnlyConnectionInfo: false,
+
+        forwardProxy: false,
+
+        publicCredentialsSaveEnabled: true,
+        adminCredentialsSaveEnabled: true,
+
+        resourceManagerEnabled: true,
+
+        resourceQuotas: {
+            dataExportFileSizeLimit: 10000000,
+            resourceManagerFileSizeLimit: 500000,
+            sqlMaxRunningQueries: 100,
+            sqlResultSetRowsLimit: 100000,
+            sqlResultSetMemoryLimit: 2000000,
+            sqlTextPreviewMaxLength: 4096,
+            sqlBinaryPreviewMaxLength: 261120
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledDrivers: [
+            "sqlite:sqlite_jdbc",
+            "h2:h2_embedded",
+            "h2:h2_embedded_v2",
+            "clickhouse:yandex_clickhouse"
+        ]
+
+    }
+
+}

config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/provided-connections.json

@@ -0,0 +1,4 @@
+{
+	"folders": {},
+	"connections": {}
+}

config/sample-databases/SQLiteConfiguration/cloudbeaver.conf

@@ -0,0 +1,68 @@
+{
+    server: {
+        serverPort: 8978,
+
+        workspaceLocation: "workspace",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        rootURI: "/",
+        serviceURI: "/api/",
+
+        productConfiguration: "conf/product.conf",
+
+        expireSessionAfterPeriod: 1800000,
+
+        develMode: false,
+
+        enableSecurityManager: false,
+
+        database: {
+            driver="h2_embedded_v2",
+            url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
+            initialDataConfiguration: "conf/initial-data.conf",
+            pool: {
+                minIdleConnections: 4,
+                maxIdleConnections: 10,
+                maxConnections: 100,
+                validationQuery: "SELECT 1"
+            }
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: true,
+        anonymousUserRole: "user",
+        grantConnectionsAccessToAnonymousTeam: false,
+        supportsCustomConnections: false,
+        showReadOnlyConnectionInfo: false,
+
+        forwardProxy: false,
+
+        publicCredentialsSaveEnabled: true,
+        adminCredentialsSaveEnabled: true,
+
+        resourceManagerEnabled: true,
+
+        resourceQuotas: {
+            dataExportFileSizeLimit: 10000000,
+            resourceManagerFileSizeLimit: 500000,
+            sqlMaxRunningQueries: 100,
+            sqlResultSetRowsLimit: 100000,
+            sqlResultSetMemoryLimit: 2000000,
+            sqlTextPreviewMaxLength: 4096,
+            sqlBinaryPreviewMaxLength: 261120
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledDrivers: [
+            "h2:h2_embedded",
+            "h2:h2_embedded_v2",
+            "clickhouse:yandex_clickhouse"
+        ]
+
+    }
+
+}

deploy/build-sqlite.bat

@@ -0,0 +1 @@
+@call build.bat ..\config\sample-databases\SQLiteConfiguration ..\config\sample-databases\db

deploy/build-sqlite.sh

@@ -0,0 +1 @@
+./build.sh '../config/sample-databases/SQLiteConfiguration' '../config/sample-databases/db'

deploy/build.bat

@@ -1,4 +1,12 @@
 @echo off
+
+rem command line arguments
+SET CONFIGURATION_PATH=%1
+SET SAMPLE_DATABASE_PATH=%2
+
+IF "%CONFIGURATION_PATH%"=="" SET CONFIGURATION_PATH="..\config\sample-databases\DefaultConfiguration"
+echo "Configuration path=%CONFIGURATION_PATH%"
+
 echo Clone and build Cloudbeaver
 
 IF EXIST drivers rmdir /S /Q drivers
@@ -9,16 +17,19 @@ mkdir cloudbeaver\conf
 mkdir cloudbeaver\workspace
 mkdir cloudbeaver\web
 
+echo Pull cloudbeaver platform
+
+cd ..\..
+
 echo Pull dbeaver platform
 
-cd ../..
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
 
 cd ..\server\product\aggregate
-call mvn clean package -Dheadless-platform
+call mvn clean verify -Dheadless-platform
 
 cd ..\..\..\deploy
 
@@ -27,19 +38,26 @@ echo Copy server packages
 xcopy /E /Q ..\server\product\web-server\target\products\io.cloudbeaver.product\all\all\all\* cloudbeaver\server >NUL
 copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\samples
-mkdir cloudbeaver\samples\db
-xcopy /E /Q ..\samples\sample-databases\db cloudbeaver\samples\db >NUL
-copy ..\samples\sample-databases\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
-copy ..\samples\sample-databases\*.conf cloudbeaver\conf >NUL
+
+IF NOT "%SAMPLE_DATABASE_PATH%"=="" (
+    mkdir cloudbeaver\samples\db
+    xcopy /E /Q %SAMPLE_DATABASE_PATH% cloudbeaver\samples\db >NUL
+)
+copy ..\config\core\* cloudbeaver\conf >NUL
+copy %CONFIGURATION_PATH%\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
+copy %CONFIGURATION_PATH%\*.conf cloudbeaver\conf >NUL
+
 move drivers cloudbeaver >NUL
 
 echo Build static content
 
-cd ..\webapp
+cd ..\
+
+cd ..\cloudbeaver\webapp
 
 call yarn
-call lerna bootstrap
-call lerna run build --stream --scope=@cloudbeaver/product-default -- -- --mode=production
+call yarn lerna bootstrap
+call yarn lerna run build --no-bail --stream --scope=@cloudbeaver/product-default &::-- -- --env source-map
 
 cd ..\deploy
 

deploy/build.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -e
+set -Eeuo pipefail
+
+#command line arguments
+CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
+SAMPLE_DATABASE_PATH=${2-""}
 
 echo "Clone and build Cloudbeaver"
 
@@ -11,16 +15,19 @@ mkdir ./cloudbeaver/conf
 mkdir ./cloudbeaver/workspace
 mkdir ./cloudbeaver/web
 
-echo "Clone dbeaver platform"
+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 package -Dheadless-platform
+mvn clean verify -U -Dheadless-platform
 if [[ "$?" -ne 0 ]] ; then
   echo 'Could not perform package'; exit $rc
 fi
@@ -31,19 +38,29 @@ 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
-mkdir cloudbeaver/samples/db
-cp -rp ../samples/sample-databases/db cloudbeaver/samples/
-cp -rp ../samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
-cp -p ../samples/sample-databases/*.conf cloudbeaver/conf/
+
+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 ../webapp
+cd ../
+
+cd ../cloudbeaver/webapp
 
 yarn
-lerna run bootstrap
-lerna run build --stream --scope=@cloudbeaver/product-default -- -- --mode=production
+yarn lerna run bootstrap
+yarn lerna run build --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Application build failed'; exit $rc
+fi
 
 cd ../deploy
 

deploy/docker/Dockerfile

@@ -1,18 +1,8 @@
-FROM adoptopenjdk/openjdk11:x86_64-ubuntu-jdk-11.0.7_10
-
-RUN apt-get update
-RUN apt-get install -y supervisor
-
-#RUN mkdir -p /opt/cloudbeaver
+FROM eclipse-temurin:17.0.4.1_1-jre-focal
 
 COPY cloudbeaver /opt/cloudbeaver
-#RUN ["chmod", "+x", "/opt/cloudbeaver/run-server.sh"]
-
-COPY supervisor/cloudbeaver.conf /etc/supervisor/conf.d/cloudbeaver.conf
 
 EXPOSE 8978
 
-#CMD ["/usr/bin/supervisord"]
-
 WORKDIR /opt/cloudbeaver/
 ENTRYPOINT ["./run-server.sh"]

deploy/scripts/run-server.bat

@@ -1,11 +1,13 @@
-@rem echo off
+@echo off
 for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 
 IF NOT EXIST workspace\.metadata (
-    mkdir workspace\GlobalConfiguration\.dbeaver\
-    copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+    IF NOT EXIST workspace\GlobalConfiguration\.dbeaver (
+        mkdir workspace\GlobalConfiguration\.dbeaver\
+        copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+    )
 )
 
-java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+java %JAVA_OPTS% --add-modules=ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -jar  %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage

deploy/scripts/run-server.sh

@@ -4,6 +4,6 @@ launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
-[ ! -d "workspace/.metadata" ] && mkdir -p workspace/GlobalConfiguration/.dbeaver && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
+[ ! -d "workspace/.metadata" ] && mkdir -p workspace/.metadata && mkdir -p workspace/GlobalConfiguration/.dbeaver && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
-java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+java ${JAVA_OPTS} --add-modules=ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -jar  ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage

javaConfig.json

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

org.jkiss.cloudbeaver.tp.target

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="org.jkiss.tp.cloudbeaver">
+	<locations>
+		<location path="${env_var:DBEAVER_DEVEL_ECLIPSE_PATH}/plugins" type="Directory"/>
+	</locations>
+</target>

samples/sample-databases/cloudbeaver.conf

@@ -1,55 +0,0 @@
-{
-    server: {
-        serverPort: 8978,
-
-        workspaceLocation: "workspace",
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        rootURI: "/",
-        serviceURI: "/dbeaver/",
-
-        productConfiguration: "conf/product.conf",
-
-        expireSessionAfterPeriod: 1800000,
-
-        develMode: false,
-
-        database: {
-            driver="h2_embedded",
-            url: "jdbc:h2:${workspace}/.data/cb.h2.dat",
-
-            createDatabase: true,
-
-            initialDataConfiguration: "conf/initial-data.conf",
-
-            pool: {
-                minIdleConnections: 4,
-                maxIdleConnections: 10,
-                maxConnections: 100,
-                validationQuery: "SELECT 1"
-            }
-        }
-
-    },
-    app: {
-        anonymousAccessEnabled: true,
-        authenticationEnabled: true,
-        anonymousUserRole: "user",
-        supportsCustomConnections: false
-
-        /*
-        enabledDrivers: [
-            "postgresql:postgres-jdbc",
-            "mysql:mysql8",
-            "mysql:mariaDB",
-            "generic:sqlite_jdbc",
-            "generic:derby_server",
-            "generic:h2_embedded",
-            "jaybird:jaybird",
-        ]
-        */
-
-    }
-
-}

samples/sample-databases/initial-data.conf

@@ -1,16 +0,0 @@
-{
-    roles: [
-        {
-            roleId: "admin",
-            name: "Admin",
-            description: "Administrative access. Has all permissions.",
-            permissions: [ "public", "admin" ]
-        },
-        {
-            roleId: "user",
-            name: "User",
-            description: "Standard user.",
-            permissions: [ "public" ]
-        }
-    ]
-}

server/bundles/io.cloudbeaver.connect.provider.sample/META-INF/MANIFEST.MF

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: io.cloudbeaver.connect.provider.sample;singleton:=true
-Bundle-Version: 1.0.15.qualifier
-Bundle-Release-Date: 20201019
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.apache.commons.logging,
- org.eclipse.core.commands,
- org.eclipse.core.resources,
- io.cloudbeaver.server,
- com.google.gson,
- org.jkiss.bundle.graphql.java,
- org.jkiss.dbeaver.model,
- org.jkiss.dbeaver.model.sql
-Bundle-Localization: OSGI-INF/l10n/bundle
-Automatic-Module-Name: io.cloudbeaver.connect.provider.sample

server/bundles/io.cloudbeaver.connect.provider.sample/OSGI-INF/l10n/bundle.properties

@@ -1,2 +0,0 @@
-Bundle-Vendor = DBeaver Corp
-Bundle-Name = Cloudbeaver - Connections configuration - Sample

server/bundles/io.cloudbeaver.connect.provider.sample/plugin.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<plugin>
-
-    <extension point="org.jkiss.dbeaver.dataSourceStorage">
-        <storage id="sample" name="Sample configuration storage" description="Preconfigured sample connection set" class="io.cloudbeaver.connect.provider.sample.SampleDataSourceConfigurationStorage">
-
-        </storage>
-    </extension>
-
-</plugin>

server/bundles/io.cloudbeaver.connect.provider.sample/src/io/cloudbeaver/connect/provider/sample/SampleDataSourceConfigurationStorage.java

@@ -1,87 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 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.connect.provider.sample;
-
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPDataSourceConfigurationStorage;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Sample configuration storage.
- * Is the main source of data in web application
- */
-public class SampleDataSourceConfigurationStorage implements DBPDataSourceConfigurationStorage {
-
-    private static final Log log = Log.getLog(SampleDataSourceConfigurationStorage.class);
-
-    public static final String SAMPLE_CONFIG_NAME = "provided-connections.json";
-
-    @Override
-    public String getStorageId() {
-        return "Sample";
-    }
-
-    @Override
-    public boolean isValid() {
-        return false;
-    }
-
-    @Override
-    public boolean isDefault() {
-        return false;
-    }
-
-    @Override
-    public boolean isDynamic() {
-        return false;
-    }
-
-    @Override
-    public String getStatus() {
-        return "Valid";
-    }
-
-    @Override
-    public List<? extends DBPDataSourceContainer> loadDataSources(DBPDataSourceRegistry registry, Map<String, Object> options) throws DBException {
-        File metadataFolder = registry.getProject().getMetadataFolder(false);
-        if (metadataFolder.exists()) {
-            File sampleConfigFile = new File(metadataFolder, SAMPLE_CONFIG_NAME);
-            if (sampleConfigFile.exists()) {
-                log.debug("Loading provided connections from [" + sampleConfigFile.getAbsolutePath() + "]");
-                List<? extends DBPDataSourceContainer> dsList = registry.loadDataSourcesFromFile(this, sampleConfigFile);
-//                for (DBPDataSourceContainer ds : dsList) {
-//                    log.debug("\tProvided connection: " + ds.getName());
-//                }
-                return dsList;
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public String getConfigurationFileSuffix() {
-        return "-sample";
-    }
-
-}

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

@@ -0,0 +1,42 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
+Bundle-Version: 1.0.31.qualifier
+Bundle-Release-Date: 20230626
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Require-Bundle:  org.jkiss.dbeaver.data.gis;visibility:=reexport,
+ org.jkiss.dbeaver.model;visibility:=reexport,
+ org.jkiss.dbeaver.model.sm;visibility:=reexport,
+ org.jkiss.dbeaver.model.event;visibility:=reexport,
+ org.jkiss.dbeaver.registry;visibility:=reexport,
+ org.jkiss.dbeaver.net.ssh,
+ org.jkiss.bundle.graphql.java;visibility:=reexport,
+ org.jkiss.bundle.apache.dbcp,
+ com.google.gson;visibility:=reexport,
+ jakarta.servlet-api;visibility:=reexport
+Export-Package: io.cloudbeaver,
+ io.cloudbeaver.auth,
+ io.cloudbeaver.auth.provider,
+ io.cloudbeaver.auth.provider.local,
+ io.cloudbeaver.websocket,
+ io.cloudbeaver.model,
+ io.cloudbeaver.model.app,
+ io.cloudbeaver.model.rm,
+ io.cloudbeaver.model.rm.local,
+ io.cloudbeaver.model.rm.lock,
+ io.cloudbeaver.model.session,
+ io.cloudbeaver.model.user,
+ io.cloudbeaver.registry,
+ io.cloudbeaver.server,
+ io.cloudbeaver.service,
+ io.cloudbeaver.service.admin,
+ io.cloudbeaver.service.security,
+ io.cloudbeaver.service.sql,
+ io.cloudbeaver.utils,
+ io.cloudbeaver.utils.file
+Automatic-Module-Name: io.cloudbeaver.model
+Import-Package: org.slf4j

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle.properties

@@ -0,0 +1,2 @@
+Bundle-Vendor = DBeaver Corp
+Bundle-Name = Cloudbeaver Web Model

server/bundles/io.cloudbeaver.model/build.properties

@@ -0,0 +1,7 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+    META-INF/,\
+    plugin.xml,\
+    schema/,\
+    OSGI-INF/

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+    <extension-point id="io.cloudbeaver.service" name="Web services" schema="schema/io.cloudbeaver.service.exsd"/>
+    <extension-point id="io.cloudbeaver.feature" name="Web features" schema="schema/io.cloudbeaver.feature.exsd"/>
+    <extension-point id="io.cloudbeaver.valueSerializer" name="Web value serializers" schema="schema/io.cloudbeaver.valueSerializer.exsd"/>
+    <extension-point id="org.jkiss.dbeaver.auth.provider" name="%extension-point.org.jkiss.dbeaver.authProvider.name" schema="schema/org.jkiss.dbeaver.authProvider.exsd"/>
+    <extension-point id="io.cloudbeaver.metaParameters" name="Meta parameters" schema="schema/io.cloudbeaver.metaParameters.exsd"/>
+    <extension-point id="io.cloudbeaver.rm.file.handler" name="RM file operations handler"
+                     schema="schema/io.cloudbeaver.rmFileHandler.exsd"/>
+
+    <extension point="io.cloudbeaver.metaParameters">
+        <metaParameters type="user">
+            <propertyGroup label="Main">
+                <property id="firstName" label="First Name" type="string" description="User first name"/>
+                <property id="lastName" label="Last Name" type="string" description="User last name"/>
+            </propertyGroup>
+        </metaParameters>
+    </extension>
+
+</plugin>

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

@@ -9,8 +9,8 @@
         <version>1.0.0-SNAPSHOT</version>
          <relativePath>../</relativePath>
     </parent>
-    <artifactId>io.cloudbeaver.connect.provider.sample</artifactId>
-    <version>1.0.15-SNAPSHOT</version>
+    <artifactId>io.cloudbeaver.model</artifactId>
+    <version>1.0.31-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model/schema/io.cloudbeaver.feature.exsd

@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="io.cloudbeaver.model" id="io.cloudbeaver.feature" name="Web features"/>
+      </appInfo>
+      <documentation>
+         Web feature
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="feature"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="feature">
+      <annotation>
+         <documentation>
+            Web service description
+         </documentation>
+      </annotation>
+   </element>
+
+
+</schema>

server/bundles/io.cloudbeaver.model/schema/io.cloudbeaver.metaParameters.exsd

@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="io.cloudbeaver.model" id="io.cloudbeaver.metaParameters" name="Subject meta parameters"/>
+      </appInfo>
+      <documentation>
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="propertyGroup"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="driver">
+      <annotation>
+         <documentation>
+            Web service description
+         </documentation>
+      </annotation>
+   </element>
+
+
+</schema>

server/bundles/io.cloudbeaver.model/schema/io.cloudbeaver.rmFileHandler.exsd

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="io.cloudbeaver.rm.file.handler" id="io.cloudbeaver.rm.file.handler" name="RM file operations handler"/>
+      </appInfo>
+      <documentation>
+         RM file operations handler
+      </documentation>
+   </annotation>
+</schema>

server/bundles/io.cloudbeaver.model/schema/io.cloudbeaver.service.exsd

@@ -5,7 +5,7 @@
          <meta.schema plugin="io.cloudbeaver.server" id="io.cloudbeaver.service" name="Web services"/>
       </appInfo>
       <documentation>
-         DBeaver data source provider
+         Web service
       </documentation>
    </annotation>
 

server/bundles/io.cloudbeaver.model/schema/io.cloudbeaver.valueSerializer.exsd

@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="io.cloudbeaver.server" id="io.cloudbeaver.valueSerializer" name="Web value serializers"/>
+      </appInfo>
+      <documentation>
+         DBeaver web value serializers
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="serializer"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="serializer">
+      <annotation>
+         <documentation>
+            DBeaver web value serializer
+         </documentation>
+      </annotation>
+   </element>
+
+
+</schema>

server/bundles/io.cloudbeaver.model/schema/org.jkiss.dbeaver.authProvider.exsd

@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="io.cloudbeaver.model" id="org.jkiss.dbeaver.auth.provider" name="Authentication provider"/>
+      </appInfo>
+      <documentation>
+         DBeaver auth provider
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+   </element>
+
+   <element name="model">
+      <annotation>
+         <documentation>
+            Data source auth model description
+         </documentation>
+      </annotation>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="appInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>

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

@@ -0,0 +1,156 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import io.cloudbeaver.model.rm.RMUtils;
+import org.eclipse.core.resources.IProject;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
+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.registry.BaseProjectImpl;
+import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.Pair;
+
+import java.nio.file.Path;
+import java.util.Collection;
+
+public class BaseWebProjectImpl extends BaseProjectImpl {
+
+    @NotNull
+    private final RMProject project;
+
+    @NotNull
+    private final Path path;
+    @NotNull
+    protected final DataSourceFilter dataSourceFilter;
+    private final RMController resourceController;
+
+    public BaseWebProjectImpl(
+        @NotNull DBPWorkspace workspace,
+        @NotNull RMController resourceController,
+        @NotNull SMSessionContext sessionContext,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter
+    ) {
+        super(workspace, sessionContext);
+        this.resourceController = resourceController;
+        this.path = RMUtils.getProjectPath(project);
+        this.project = project;
+        this.dataSourceFilter = dataSourceFilter;
+    }
+
+    @NotNull
+    public RMController getResourceController() {
+        return resourceController;
+    }
+
+    @Override
+    public boolean isVirtual() {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return project.getDisplayName();
+    }
+
+    @NotNull
+    @Override
+    public String getId() {
+        return project.getId();
+    }
+
+    @NotNull
+    @Override
+    public Path getAbsolutePath() {
+        return path;
+    }
+
+    @Nullable
+    @Override
+    public IProject getEclipseProject() {
+        return null;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return true;
+    }
+
+    @Override
+    public void ensureOpen() {
+
+    }
+
+    @Override
+    public boolean isUseSecretStorage() {
+        return false;
+    }
+
+    @NotNull
+    public RMProject getRmProject() {
+        return this.project;
+    }
+
+    /**
+     * Method for Bulk Update of resources properties paths
+     *
+     * @param oldToNewPaths collection of OldPath to NewPath pairs
+     */
+    public void moveResourcePropertiesBatch(@NotNull Collection<Pair<String, String>> oldToNewPaths) {
+        loadMetadata();
+        synchronized (metadataSync) {
+            for (var pathsPair : oldToNewPaths) {
+                final var oldResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getFirst());
+                final var newResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getSecond());
+                final var resProps = resourceProperties.remove(oldResourcePath);
+                if (resProps != null) {
+                    resourceProperties.put(newResourcePath, resProps);
+                }
+            }
+        }
+        flushMetadata();
+    }
+
+    /**
+     * Method for Bulk Remove of resources properties
+     */
+    public boolean resetResourcesPropertiesBatch(@NotNull Collection<String> resourcesPaths) {
+        loadMetadata();
+        boolean propertiesChanged = false;
+        synchronized (metadataSync) {
+            for (var resourcePath : resourcesPaths) {
+                var removedProperties = resourceProperties.remove(CommonUtils.normalizeResourcePath(resourcePath));
+                if (removedProperties != null) {
+                    propertiesChanged = true;
+                }
+            }
+        }
+        if (propertiesChanged) {
+            flushMetadata();
+        }
+        return propertiesChanged;
+    }
+
+    public Path getMetadataFilePath() {
+        return getMetadataPath().resolve(METADATA_STORAGE_FILE);
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import org.jkiss.dbeaver.model.access.DBAPermissionRealm;
+
+/**
+ * General constants
+ */
+public class DBWConstants {
+
+    public static final String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
+
+    public static final String PERMISSION_CONFIGURATION_MANAGER = "configuration-manager";
+    public static final String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+
+    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";
+
+    public static final String USER_PROJECTS_FOLDER = "user-projects";
+    public static final String SHARED_PROJECTS_FOLDER = "shared-projects";
+
+    public enum SignInState {
+        GLOBAL,
+        EMBEDDED
+    }
+
+    //public static final String PERMISSION_USER = "user";
+
+}

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

@@ -0,0 +1,39 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBPImage;
+
+/**
+ * Web feature
+ */
+public interface DBWFeatureSet {
+
+    @NotNull
+    String getId();
+
+    @NotNull
+    String getLabel();
+
+    String getDescription();
+
+    DBPImage getIcon();
+
+    boolean isEnabled();
+
+}

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

@@ -0,0 +1,94 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * User identity provided by auth provider.
+ */
+public class DBWUserIdentity {
+    @NotNull
+    private final String id;
+    @NotNull
+    private final String displayName;
+
+    private final Map<String, String> metaParameters = new LinkedHashMap<>();
+    @Nullable
+    private String providedUserRole;
+    @Nullable
+    private String[] providedTeamIds;
+
+    public DBWUserIdentity(@NotNull String id, @NotNull String displayName) {
+        this(id, displayName, Map.of());
+    }
+
+    public DBWUserIdentity(
+        @NotNull String id,
+        @NotNull String displayName,
+        @NotNull Map<String, String> metaParameters
+    ) {
+        this.id = id;
+        this.displayName = displayName;
+        this.metaParameters.putAll(metaParameters);
+    }
+
+    @NotNull
+    public String getId() {
+        return id;
+    }
+
+    @NotNull
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    @NotNull
+    public Map<String, String> getMetaParameters() {
+        return Map.copyOf(metaParameters);
+    }
+
+    public void setMetaParameter(@NotNull String name, @Nullable String value) {
+        if (value == null) {
+            metaParameters.remove(name);
+        } else {
+            metaParameters.put(name, value);
+        }
+    }
+
+    @Nullable
+    public String getProvidedUserRole() {
+        return providedUserRole;
+    }
+
+    public void setProvidedUserRole(@Nullable String providedUserRole) {
+        this.providedUserRole = providedUserRole;
+    }
+
+    @Nullable
+    public String[] getProvidedTeamIds() {
+        return providedTeamIds;
+    }
+
+    public void setProvidedTeamIds(@Nullable String[] providedTeamIds) {
+        this.providedTeamIds = providedTeamIds;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,8 +20,6 @@ import graphql.ErrorClassification;
 import graphql.ErrorType;
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
-import io.cloudbeaver.server.graphql.GraphQLEndpoint;
-import io.cloudbeaver.service.WebServiceBindingBase;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.utils.GeneralUtils;
@@ -40,8 +38,10 @@ public class DBWebException extends DBException implements GraphQLError {
 
     public static final String ERROR_CODE_SESSION_EXPIRED = "sessionExpired";
     public static final String ERROR_CODE_ACCESS_DENIED = "accessDenied";
+    public static final String ERROR_CODE_LICENSE_DENIED = "licenseRequired";
     public static final String ERROR_CODE_IDENT_REQUIRED = "identRequired";
     public static final String ERROR_CODE_AUTH_REQUIRED = "authRequired";
+    public static final String ERROR_CODE_QUOTA_EXCEEDED = "quotaExceeded";
 
     private List<Object> path;
     private List<SourceLocation> locations;
@@ -107,24 +107,27 @@ public class DBWebException extends DBException implements GraphQLError {
 
         Map<String, Object> extensions = new LinkedHashMap<>();
         String stString = buf.toString();
-        int divPos = stString.indexOf(WebServiceBindingBase.class.getName());
+        // Cur redundant stacktrace before CB handlers
+        int divPos = stString.indexOf("WebServiceBindingBase");
         if (divPos == -1) {
-            divPos = stString.indexOf(GraphQLEndpoint.class.getName());
+            divPos = stString.indexOf("GraphQLEndpoint");
         }
         if (divPos != -1) {
-            stString = stString.substring(0, divPos);
-            divPos = stString.lastIndexOf(")");
-            if (divPos != -1) {
-                stString = stString.substring(0, divPos + 1);
+            for (int i = divPos; i >= 0; i--) {
+                if (stString.charAt(i) == '\n') {
+                    divPos = i;
+                    break;
+                }
             }
+            stString = stString.substring(0, divPos);
         }
         divPos = stString.indexOf(':');
         if (divPos != -1) {
-            String exceptionClass = stString.substring(0, divPos);
+            String exceptionClass = stString.substring(0, divPos).trim();
             extensions.put("exceptionClass", exceptionClass);
-            stString = stString.substring(divPos + 1).trim();
+            //stString = stString.substring(divPos + 1).trim();
         }
-        extensions.put("stackTrace", stString);
+        extensions.put("stackTrace", stString.trim());
         int errorCode = getErrorCode();
         if (errorCode != ERROR_CODE_NONE) {
             extensions.put("errorCode", errorCode);
@@ -141,6 +144,18 @@ public class DBWebException extends DBException implements GraphQLError {
     }
 
     private static String makeMessage(String message, Throwable cause) {
+        if (CommonUtils.isEmpty(message)) {
+            if (cause != null) {
+                if (cause.getMessage() != null) {
+                    return cause.getMessage();
+                }
+                return cause.getClass().getName();
+            }
+            return "Unknown internal error";
+        }
+        if (CommonUtils.equalObjects(message, cause.getMessage())) {
+            return message;
+        }
         return message + ":\n" + cause.getMessage();
     }
 

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

@@ -0,0 +1,31 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+
+@FunctionalInterface
+public interface DataSourceFilter {
+    /**
+     * Filter datasource from registry
+     *
+     * @param dataSourceContainer
+     * @return true if datasource accessible
+     */
+    boolean filter(DBPDataSourceContainer dataSourceContainer);
+}

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

@@ -0,0 +1,353 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+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.access.DBAAuthProfile;
+import org.jkiss.dbeaver.model.access.DBACredentialsProvider;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
+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.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.secret.DBSSecretController;
+import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
+import org.jkiss.dbeaver.registry.DataSourceConfigurationManager;
+import org.jkiss.dbeaver.registry.DataSourcePersistentRegistry;
+import org.jkiss.dbeaver.registry.DataSourceRegistry;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSourcePersistentRegistry, DBPDataSourceRegistryCache {
+    private final DataSourceFilter dataSourceFilter;
+    private final DataSourceRegistry dataSourceRegistry;
+
+    public WebDataSourceRegistryProxy(DataSourceRegistry dataSourceRegistry, DataSourceFilter filter) {
+        this.dataSourceRegistry = dataSourceRegistry;
+        this.dataSourceFilter = filter;
+    }
+
+    @Override
+    public DBPProject getProject() {
+        return dataSourceRegistry.getProject();
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceContainer getDataSource(String id) {
+        DBPDataSourceContainer dataSource = dataSourceRegistry.getDataSource(id);
+        if (dataSource == null || dataSourceFilter != null && !dataSourceFilter.filter(dataSource)) {
+            return null;
+        }
+        return dataSource;
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceContainer getDataSource(DBPDataSource dataSource) {
+        if (dataSourceFilter != null && !dataSourceFilter.filter(dataSource.getContainer())) {
+            return null;
+        }
+        return dataSourceRegistry.getDataSource(dataSource);
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceContainer findDataSourceByName(String name) {
+        var dataSource = dataSourceRegistry.findDataSourceByName(name);
+        if (dataSource != null) {
+            if (dataSourceFilter == null || dataSourceFilter.filter(dataSource)) {
+                return dataSource;
+            }
+        }
+        return null;
+    }
+
+    @NotNull
+    @Override
+    public List<? extends DBPDataSourceContainer> getDataSourcesByProfile(@NotNull DBWNetworkProfile profile) {
+        return dataSourceRegistry.getDataSourcesByProfile(profile)
+            .stream()
+            .filter(dataSourceFilter::filter)
+            .collect(Collectors.toList());
+    }
+
+    @NotNull
+    @Override
+    public List<DBPDataSourceContainer> getDataSources() {
+        return dataSourceRegistry.getDataSources()
+            .stream()
+            .filter(dataSourceFilter::filter)
+            .collect(Collectors.toList());
+    }
+
+    @NotNull
+    @Override
+    public DBPDataSourceContainer createDataSource(DBPDriver driver, DBPConnectionConfiguration connConfig) {
+        return dataSourceRegistry.createDataSource(driver, connConfig);
+    }
+
+    @NotNull
+    @Override
+    public DBPDataSourceContainer createDataSource(DBPDataSourceContainer source) {
+        return dataSourceRegistry.createDataSource(source);
+    }
+
+    @Override
+    public void addDataSourceListener(@NotNull DBPEventListener listener) {
+        dataSourceRegistry.addDataSourceListener(listener);
+    }
+
+    @Override
+    public boolean removeDataSourceListener(@NotNull DBPEventListener listener) {
+        return dataSourceRegistry.removeDataSourceListener(listener);
+    }
+
+    @Override
+    public void addDataSource(@NotNull DBPDataSourceContainer dataSource) throws DBException {
+        dataSourceRegistry.addDataSource(dataSource);
+    }
+
+    @Override
+    public void removeDataSource(@NotNull DBPDataSourceContainer dataSource) {
+        dataSourceRegistry.removeDataSource(dataSource);
+    }
+
+    @Override
+    public void addDataSourceToList(@NotNull DBPDataSourceContainer dataSource) {
+        dataSourceRegistry.addDataSourceToList(dataSource);
+    }
+
+    @Override
+    public void removeDataSourceFromList(@NotNull DBPDataSourceContainer dataSource) {
+        dataSourceRegistry.removeDataSourceFromList(dataSource);
+    }
+
+    @Override
+    public void updateDataSource(@NotNull DBPDataSourceContainer dataSource) throws DBException {
+        dataSourceRegistry.updateDataSource(dataSource);
+    }
+
+    @NotNull
+    @Override
+    public List<? extends DBPDataSourceFolder> getAllFolders() {
+        return dataSourceRegistry.getAllFolders();
+    }
+
+    @NotNull
+    @Override
+    public List<? extends DBPDataSourceFolder> getRootFolders() {
+        return dataSourceRegistry.getRootFolders();
+    }
+
+    @Override
+    public DBPDataSourceFolder getFolder(String path) {
+        return dataSourceRegistry.getFolder(path);
+    }
+
+    @Override
+    public DBPDataSourceFolder addFolder(DBPDataSourceFolder parent, String name) {
+        return dataSourceRegistry.addFolder(parent, name);
+    }
+
+    @Override
+    public void removeFolder(DBPDataSourceFolder folder, boolean dropContents) {
+        dataSourceRegistry.removeFolder(folder, dropContents);
+    }
+
+    @Override
+    public void moveFolder(@NotNull String oldPath, @NotNull String newPath) {
+        dataSourceRegistry.moveFolder(oldPath, newPath);
+    }
+
+    @Nullable
+    @Override
+    public DBSObjectFilter getSavedFilter(String name) {
+        return dataSourceRegistry.getSavedFilter(name);
+    }
+
+    @NotNull
+    @Override
+    public List<DBSObjectFilter> getSavedFilters() {
+        return dataSourceRegistry.getSavedFilters();
+    }
+
+    @Override
+    public void updateSavedFilter(DBSObjectFilter filter) {
+        dataSourceRegistry.updateSavedFilter(filter);
+    }
+
+    @Override
+    public void removeSavedFilter(String filterName) {
+        dataSourceRegistry.removeSavedFilter(filterName);
+    }
+
+    @Nullable
+    @Override
+    public DBWNetworkProfile getNetworkProfile(String name) {
+        return dataSourceRegistry.getNetworkProfile(name);
+    }
+
+    @NotNull
+    @Override
+    public List<DBWNetworkProfile> getNetworkProfiles() {
+        return dataSourceRegistry.getNetworkProfiles();
+    }
+
+    @Override
+    public void updateNetworkProfile(DBWNetworkProfile profile) {
+        dataSourceRegistry.updateNetworkProfile(profile);
+    }
+
+    @Override
+    public void removeNetworkProfile(DBWNetworkProfile profile) {
+        dataSourceRegistry.removeNetworkProfile(profile);
+    }
+
+    @Nullable
+    @Override
+    public DBAAuthProfile getAuthProfile(String id) {
+        return dataSourceRegistry.getAuthProfile(id);
+    }
+
+    @NotNull
+    @Override
+    public List<DBAAuthProfile> getAllAuthProfiles() {
+        return dataSourceRegistry.getAllAuthProfiles();
+    }
+
+    @NotNull
+    @Override
+    public List<DBAAuthProfile> getApplicableAuthProfiles(@Nullable DBPDriver driver) {
+        return dataSourceRegistry.getApplicableAuthProfiles(driver);
+    }
+
+    @Override
+    public void updateAuthProfile(DBAAuthProfile profile) {
+        dataSourceRegistry.updateAuthProfile(profile);
+    }
+
+    @Override
+    public void removeAuthProfile(DBAAuthProfile profile) {
+        dataSourceRegistry.removeAuthProfile(profile);
+    }
+
+    @Override
+    public void flushConfig() {
+        dataSourceRegistry.flushConfig();
+    }
+
+    @Override
+    public void refreshConfig() {
+        dataSourceRegistry.refreshConfig();
+    }
+
+    @Override
+    public void refreshConfig(@Nullable Collection<String> dataSourceIds) {
+        dataSourceRegistry.refreshConfig(dataSourceIds);
+    }
+
+    @Override
+    public Throwable getLastError() {
+        return dataSourceRegistry.getLastError();
+    }
+
+    @Override
+    public boolean hasError() {
+        return dataSourceRegistry.hasError();
+    }
+
+    @Override
+    public void checkForErrors() throws DBException {
+        dataSourceRegistry.checkForErrors();
+    }
+
+    @Override
+    public void notifyDataSourceListeners(DBPEvent event) {
+        dataSourceRegistry.notifyDataSourceListeners(event);
+    }
+
+    @Nullable
+    @Override
+    public DBACredentialsProvider getAuthCredentialsProvider() {
+        return dataSourceRegistry.getAuthCredentialsProvider();
+    }
+
+    @Override
+    public void dispose() {
+        dataSourceRegistry.dispose();
+    }
+
+    @Override
+    public void setAuthCredentialsProvider(DBACredentialsProvider authCredentialsProvider) {
+        dataSourceRegistry.setAuthCredentialsProvider(authCredentialsProvider);
+    }
+
+    @Override
+    public Set<DBPDataSourceFolder> getTemporaryFolders() {
+        return dataSourceRegistry.getTemporaryFolders();
+    }
+
+    @Override
+    public boolean loadDataSources(
+        @NotNull List<DBPDataSourceConfigurationStorage> storages,
+        @NotNull DataSourceConfigurationManager manager,
+        @Nullable Collection<String> dataSourceIds, boolean refresh,
+        boolean purgeUntouched
+    ) {
+        return dataSourceRegistry.loadDataSources(storages, manager, dataSourceIds, refresh, purgeUntouched);
+    }
+
+    @Override
+    public void saveDataSources() {
+        dataSourceRegistry.saveDataSources();
+    }
+
+    @Override
+    public DataSourceConfigurationManager getConfigurationManager() {
+        return dataSourceRegistry.getConfigurationManager();
+    }
+
+    @Override
+    public void saveConfigurationToManager(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull DataSourceConfigurationManager configurationManager,
+        @Nullable Predicate<DBPDataSourceContainer> filter
+    ) {
+        dataSourceRegistry.saveConfigurationToManager(monitor, configurationManager, filter);
+    }
+
+    @Override
+    public void persistSecrets(DBSSecretController secretController) throws DBException {
+        dataSourceRegistry.persistSecrets(secretController);
+    }
+
+    @Override
+    public void resolveSecrets(DBSSecretController secretController) throws DBException {
+        dataSourceRegistry.resolveSecrets(secretController);
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+import org.jkiss.code.NotNull;
+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.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.registry.rm.DataSourceRegistryRM;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
+
+public class WebProjectImpl extends BaseWebProjectImpl {
+    private static final Log log = Log.getLog(WebProjectImpl.class);
+
+    public WebProjectImpl(
+        @NotNull DBPWorkspace workspace,
+        @NotNull RMController resourceController,
+        @NotNull SMSessionContext sessionContext,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter
+    ) {
+        super(workspace, resourceController, sessionContext, project, dataSourceFilter);
+    }
+
+    @Override
+    public Object getProjectProperty(String propName) {
+        try {
+            return getResourceController().getProjectProperty(getId(), propName);
+        } catch (DBException e) {
+            log.error("Cannot get project property", e);
+            return null;
+        }
+    }
+
+    @Override
+    public void setProjectProperty(String propName, Object propValue) {
+        try {
+            getResourceController().setProjectProperty(getId(), propName, propValue);
+        } catch (DBException e) {
+            log.error("Cannot set project property", e);
+        }
+    }
+
+    @Override
+    public boolean isUseSecretStorage() {
+        return DBWorkbench.isDistributed();
+    }
+
+    @NotNull
+    @Override
+    protected DBPDataSourceRegistry createDataSourceRegistry() {
+        return new WebDataSourceRegistryProxy(
+            new DataSourceRegistryRM(this, getResourceController()),
+            dataSourceFilter
+        );
+    }
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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;
+
+public interface CBAuthConstants {
+    String CB_AUTH_ID_COOKIE_NAME = "cb-auth-id";
+
+    String CB_REDIRECT_URL_COOKIE_NAME = "cb-redirect-url";
+
+    String CB_AUTH_ID_REQUEST_PARAM = "authId";
+    String CB_AUTO_LOGIN_REQUEST_PARAM = "autoLogin";
+    String CB_REDIRECT_URL_REQUEST_PARAM = "redirectUrl";
+
+    // 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-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.model.resources;
 
-import io.cloudbeaver.server.CBWorkspace;
-import org.jkiss.dbeaver.registry.ProjectMetadata;
+package io.cloudbeaver.auth;
 
-/**
- * Web workspace
- */
-public class WebProject extends ProjectMetadata {
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.auth.SMCredentials;
+import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
 
-    public WebProject(CBWorkspace workspace) {
-        super(workspace, workspace.getEclipseWorkspace().getRoot().getProject());
+public class NoAuthCredentialsProvider implements SMCredentialsProvider {
+    @Nullable
+    @Override
+    public SMCredentials getActiveUserCredentials() {
+        return null;
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,25 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver;
+package io.cloudbeaver.auth;
 
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 
 import java.util.Map;
 
 /**
- * Auth provider
+ * Auth
+ * Authenticates user using external user identity
  */
-public interface DBWAuthProvider<AUTH_SESSION> {
+public interface SMAuthProviderAssigner {
 
-    AUTH_SESSION openSession(
-        Map<String, Object> providerConfig, // Auth provider configuration (e.g. 3rd party auth server address)
-        Map<String, Object> userCredentials, // Saved user credentials (e.g. associated 3rd party provider user name or realm)
-        Map<String, Object> authParameters // Passed auth parameters (e.g. user name or password)
+    @NotNull
+    SMAutoAssign detectAutoAssignments(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull Map<String, Object> authParameters
     ) throws DBException;
 
-    void closeSession(AUTH_SESSION session) throws DBException;
-
-    void refreshSession(AUTH_SESSION session) throws DBException;
+    String getExternalTeamIdMetadataFieldName();
 
 }

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

@@ -0,0 +1,71 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DBWUserIdentity;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.model.user.WebUser;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.auth.SMAuthProvider;
+import org.jkiss.dbeaver.model.auth.SMSession;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+
+import java.util.Map;
+
+/**
+ * External auth provider.
+ * Authenticates user using external user identity
+ */
+public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends SMAuthProvider<AUTH_SESSION> {
+
+    /**
+     * Returns new identifying credentials which can be used to find/create user in database
+     */
+    @NotNull
+    default Map<String, Object> authExternalUser(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull Map<String, Object> providerConfig, // Auth provider configuration (e.g. 3rd party auth server address)
+        @NotNull Map<String, Object> authParameters // Passed auth parameters (e.g. user name or password)
+    ) throws DBException {
+        return authParameters;
+    }
+
+
+    @NotNull
+    DBWUserIdentity getUserIdentity(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull Map<String, Object> authParameters) throws DBException;
+
+    /**
+     * Get specified user details.
+     * @param user          user
+     * @param selfIdentity  true if users tries to get information about itself.
+     *                      Otherwise it is information for supervisor.
+     */
+    @Nullable
+    DBPObject getUserDetails(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull WebSession webSession,
+        @NotNull AUTH_SESSION session,
+        @NotNull WebUser user,
+        boolean selfIdentity) throws DBException;
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,34 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver;
+package io.cloudbeaver.auth;
 
-import io.cloudbeaver.model.user.WebUser;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.utils.CommonUtils;
 
 import java.util.Map;
 
 /**
- * Auth provider
+ * Federated auth provider.
+ * Provides links to external auth resource
  */
-public interface DBWAuthProviderExternal<AUTH_SESSION> extends DBWAuthProvider<AUTH_SESSION> {
+public interface SMAuthProviderFederated {
 
     /**
      * Returns new identifying credentials which can be used to find/create user in database
      */
     @NotNull
-    Map<String, Object> readExternalCredentials(
-        Map<String, Object> providerConfig, // Auth provider configuration (e.g. 3rd party auth server address)
-        Map<String, Object> authParameters // Passed auth parameters (e.g. user name or password)
-    ) throws DBException;
+    String getSignInLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
 
     @NotNull
-    WebUser registerNewUser(DBWSecurityController securityController, Map<String, Object> providerConfig, Map<String, Object> credentials) throws DBException;
+    String getSignOutLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
     @Nullable
-    String getUserDisplayName(Map<String, Object> providerConfig, Map<String, Object> credentials);
+    String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
+    @Nullable
+    default String getRedirectLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException {
+        return null;
+    }
 
 }

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

@@ -0,0 +1,50 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 java.util.ArrayList;
+import java.util.List;
+
+public class SMAutoAssign {
+    private String authRole;
+    private List<String> externalTeamIds = new ArrayList<>();
+
+    public SMAutoAssign() {
+    }
+
+    public SMAutoAssign(String authRole, List<String> externalRolesIds) {
+        this.authRole = authRole;
+        this.externalTeamIds = externalRolesIds;
+    }
+
+    public String getAuthRole() {
+        return authRole;
+    }
+
+    public void setAuthRole(String authRole) {
+        this.authRole = authRole;
+    }
+
+    public List<String> getExternalTeamIds() {
+        return externalTeamIds;
+    }
+
+    public void addExternalTeamId(String externalRoleId) {
+        this.externalTeamIds.add(externalRoleId);
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.Nullable;
+import org.jkiss.dbeaver.model.auth.SMCredentials;
+import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+
+import java.util.Set;
+
+public class SMTokenCredentialProvider implements SMCredentialsProvider {
+    private final String smAccessToken;
+
+    public SMTokenCredentialProvider(String smAccessToken) {
+        this.smAccessToken = smAccessToken;
+    }
+
+    @Nullable
+    @Override
+    public SMCredentials getActiveUserCredentials() {
+        return new SMCredentials(smAccessToken, null, null, Set.of());
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.provider;
+
+import io.cloudbeaver.auth.SMAuthProviderExternal;
+import io.cloudbeaver.model.user.WebUser;
+import org.jkiss.dbeaver.model.auth.SMSession;
+import org.jkiss.utils.CommonUtils;
+
+/**
+ * Abstract external auth provider
+ */
+public abstract class AbstractExternalAuthProvider<SESSION extends SMSession> implements SMAuthProviderExternal<SESSION> {
+
+    public static final String META_AUTH_PROVIDER = "$provider";
+    public static final String META_AUTH_SPACE_ID = "$space";
+
+    @Deprecated
+    protected void setUserOrigin(WebUser user, String type, String subType) {
+        user.setMetaParameter(META_AUTH_PROVIDER, type);
+        if (!CommonUtils.isEmpty(subType)) {
+            user.setMetaParameter(META_AUTH_SPACE_ID, subType);
+        }
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,22 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.cloudbeaver.auth.provider.local;
 
-import io.cloudbeaver.DBWAuthProvider;
-
-/**
- * Auth provider
- */
-public class LocalAuthToken {
-
-    private final String userId;
-
-    public LocalAuthToken(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
+//TODO remove after CBDatabase refactoring
+public class LocalAuthProviderConstants {
+    public static final String PROVIDER_ID = "local";
+    public static final String CRED_USER = "user";
+    public static final String CRED_PASSWORD = "password";
 }

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

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

@@ -0,0 +1,57 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.model.session.WebSession;
+import org.jkiss.dbeaver.model.DBPDataSourceFolder;
+import org.jkiss.dbeaver.model.meta.Property;
+
+public class WebConnectionFolderInfo {
+    private final String projectId;
+    private final WebSession session;
+    private final DBPDataSourceFolder dataSourceFolder;
+
+    public WebConnectionFolderInfo(WebSession session, DBPDataSourceFolder dataSourceFolder) {
+        this.session = session;
+        this.dataSourceFolder = dataSourceFolder;
+        this.projectId = dataSourceFolder.getDataSourceRegistry().getProject().getId();
+    }
+
+    public WebSession getSession() {
+        return session;
+    }
+
+    public DBPDataSourceFolder getDataSourceFolder() {
+        return dataSourceFolder;
+    }
+
+    @Property
+    public String getId() {
+        return dataSourceFolder.getFolderPath();
+    }
+
+    @Property
+    public String getProjectId() {
+        return projectId;
+    }
+
+    @Property
+    public String getDescription() {
+        return dataSourceFolder.getDescription();
+    }
+
+}

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

@@ -0,0 +1,421 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.app.BaseWebAppConfiguration;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.service.security.SMUtils;
+import io.cloudbeaver.service.sql.WebDataFormat;
+import io.cloudbeaver.utils.CBModelConstants;
+import io.cloudbeaver.utils.WebAppUtils;
+import io.cloudbeaver.utils.WebCommonUtils;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBConstants;
+import org.jkiss.dbeaver.model.DBPDataSource;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPDataSourceFolder;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.connection.DBPAuthModelDescriptor;
+import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
+import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
+import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
+import org.jkiss.dbeaver.model.navigator.DBNDataSource;
+import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
+import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
+import org.jkiss.dbeaver.model.rm.RMProjectPermission;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Web connection info
+ */
+public class WebConnectionInfo {
+
+    private static final String SECURED_VALUE = "********";
+    private final WebSession session;
+    private final DBPDataSourceContainer dataSourceContainer;
+    private WebServerError connectError;
+
+    private String connectTime;
+    private String serverVersion;
+    private String clientVersion;
+
+    private transient Map<String, Object> savedAuthProperties;
+    private transient List<WebNetworkHandlerConfigInput> savedNetworkCredentials;
+
+    public WebConnectionInfo(WebSession session, DBPDataSourceContainer ds) {
+        this.session = session;
+        this.dataSourceContainer = ds;
+    }
+
+    public WebSession getSession() {
+        return session;
+    }
+
+    public DBPDataSourceContainer getDataSourceContainer() {
+        return dataSourceContainer;
+    }
+
+    public DBPDataSource getDataSource() {
+        return dataSourceContainer.getDataSource();
+    }
+
+    @Property
+    public String getId() {
+        return dataSourceContainer.getId();
+    }
+
+    @Property
+    public String getDriverId() {
+        return dataSourceContainer.getDriver().getFullId();
+    }
+
+    @Property
+    public String getName() {
+        return dataSourceContainer.getName();
+    }
+
+    @Property
+    public String getDescription() {
+        return dataSourceContainer.getDescription();
+    }
+
+    @Property
+    public String getHost() {
+        if (canViewReadOnlyConnections()) {
+            return dataSourceContainer.getConnectionConfiguration().getHostName();
+        }
+        return SECURED_VALUE;
+    }
+
+    @Property
+    public String getPort() {
+        if (canViewReadOnlyConnections()) {
+            return dataSourceContainer.getConnectionConfiguration().getHostPort();
+        }
+        return SECURED_VALUE;
+    }
+
+    @Property
+    public String getServerName() {
+        return dataSourceContainer.getConnectionConfiguration().getServerName();
+    }
+
+    @Property
+    public String getDatabaseName() {
+        if (canViewReadOnlyConnections()) {
+            return dataSourceContainer.getConnectionConfiguration().getDatabaseName();
+        }
+        return SECURED_VALUE;
+    }
+
+    @Property
+    public String getUrl() {
+        if (canViewReadOnlyConnections()) {
+            return dataSourceContainer.getConnectionConfiguration().getUrl();
+        }
+        return SECURED_VALUE;
+    }
+
+    @Property
+    public Map<String, String> getProperties() {
+        if (canViewReadOnlyConnections()) {
+            return dataSourceContainer.getConnectionConfiguration().getProperties();
+        }
+        return Collections.emptyMap();
+    }
+
+    @Property
+    public boolean isConnected() {
+        return dataSourceContainer.isConnected();
+    }
+
+    @Property
+    public boolean isTemplate() {
+        return dataSourceContainer.isTemplate();
+    }
+
+    @Property
+    public boolean isProvided() {
+        return dataSourceContainer.isProvided();
+    }
+
+    @Property
+    public boolean isReadOnly() {
+        return dataSourceContainer.isConnectionReadOnly();
+    }
+
+    @Property
+    public boolean isUseUrl() {
+        return CommonUtils.isEmpty(dataSourceContainer.getDriver().getSampleURL());
+    }
+
+    @Property
+    public boolean isSaveCredentials() {
+        return dataSourceContainer.isSavePassword();
+    }
+
+    @Property
+    public boolean isCredentialsSaved() throws DBException {
+        return dataSourceContainer.isCredentialsSaved();
+    }
+
+    @Property
+    public boolean isSharedCredentials() {
+        return dataSourceContainer.isSharedCredentials();
+    }
+
+    @Property
+    public String getFolder() {
+        DBPDataSourceFolder folder = dataSourceContainer.getFolder();
+        return folder == null ? null : folder.getFolderPath();
+    }
+
+    @Property
+    public String getNodePath() {
+        return DBNDataSource.makeDataSourceItemPath(dataSourceContainer);
+    }
+
+    @Property
+    public String getConnectTime() {
+        return dataSourceContainer.getConnectTime() == null ? null :
+            CBModelConstants.ISO_DATE_FORMAT.format(dataSourceContainer.getConnectTime().toInstant());
+    }
+
+    @Property
+    public WebServerError getConnectError() {
+        return connectError;
+    }
+
+    public void setConnectError(Throwable connectError) {
+        this.connectError = connectError == null ? null : new WebServerError(connectError);
+    }
+
+    public void setConnectTime(String connectTime) {
+        this.connectTime = connectTime;
+    }
+
+    @Property
+    public String getServerVersion() {
+        return serverVersion;
+    }
+
+    public void setServerVersion(String serverVersion) {
+        this.serverVersion = serverVersion;
+    }
+
+    @Property
+    public String getClientVersion() {
+        return clientVersion;
+    }
+
+    public void setClientVersion(String clientVersion) {
+        this.clientVersion = clientVersion;
+    }
+
+    @Property
+    public String[] getFeatures() {
+        List<String> features = new ArrayList<>();
+
+        if (dataSourceContainer.isConnected()) {
+            features.add("connected");
+        }
+        if (dataSourceContainer.isHidden()) {
+            features.add("virtual");
+        }
+        if (dataSourceContainer.isTemporary()) {
+            features.add("temporary");
+        }
+        if (dataSourceContainer.isConnectionReadOnly()) {
+            features.add("readOnly");
+        }
+        if (dataSourceContainer.isProvided()) {
+            features.add("provided");
+        }
+        if (dataSourceContainer.isManageable()) {
+            features.add("manageable");
+        }
+
+        return features.toArray(new String[0]);
+    }
+
+    @Property
+    public DBNBrowseSettings getNavigatorSettings() {
+        return dataSourceContainer.getNavigatorSettings();
+    }
+
+    @Property
+    public List<WebDataFormat> getSupportedDataFormats() {
+        List<WebDataFormat> formats = new ArrayList<>();
+        formats.add(WebDataFormat.resultset);
+        DBPDataSource dataSource = dataSourceContainer.getDataSource();
+        if (dataSource == null) {
+            return formats;
+        }
+        if (Boolean.TRUE.equals(dataSource.getDataSourceFeature(DBPDataSource.FEATURE_DOCUMENT_DATA_SOURCE))) {
+            formats.add(WebDataFormat.document);
+        }
+        return formats;
+    }
+
+    @Property
+    public WebConnectionOriginInfo getOrigin() {
+        return new WebConnectionOriginInfo(session, dataSourceContainer, dataSourceContainer.getOrigin());
+    }
+
+    @Property
+    public DBPDriverConfigurationType getConfigurationType() {
+        DBPDriverConfigurationType configurationType = dataSourceContainer.getConnectionConfiguration().getConfigurationType();
+        if (configurationType == null) {
+            configurationType = DBPDriverConfigurationType.MANUAL;
+        }
+        return configurationType;
+    }
+
+    @Property
+    public boolean isAuthNeeded() throws DBException {
+        return !dataSourceContainer.isConnected() &&
+            !(dataSourceContainer.isCredentialsSaved() || isAuthPropertiesEmpty()) &&
+            !dataSourceContainer.getDriver().isAnonymousAccess();
+    }
+
+    // we don't show non-secured properties in FE when connecting to DB without saved credentials
+    private boolean isAuthPropertiesEmpty() {
+        return Arrays.stream(getAuthProperties()).allMatch(f -> f.hasFeature(DBConstants.PROP_FEATURE_NON_SECURED));
+    }
+
+    @Property
+    public String getAuthModel() {
+        String authModelId = dataSourceContainer.getConnectionConfiguration().getAuthModelId();
+        if (CommonUtils.isEmpty(authModelId)) {
+            authModelId = AuthModelDatabaseNative.ID;
+        }
+        return authModelId;
+    }
+
+    @Property
+    public WebPropertyInfo[] getAuthProperties() {
+        String authModelId = getAuthModel();
+        DBPAuthModelDescriptor authModel = DBWorkbench.getPlatform().getDataSourceProviderRegistry().getAuthModel(authModelId);
+        if (authModel == null) {
+            return new WebPropertyInfo[0];
+        }
+
+        // Fill session and user provided credentials
+        DBPConnectionConfiguration configWithAuth = new DBPConnectionConfiguration(dataSourceContainer.getConnectionConfiguration());
+        session.provideAuthParameters(session.getProgressMonitor(), dataSourceContainer, configWithAuth);
+
+        // show all properties if it is a manual connection
+        Predicate<DBPPropertyDescriptor> predicate = CommonUtils.isEmpty(getRequiredAuth())
+            ? p -> true
+            : p -> WebCommonUtils.isAuthPropertyApplicable(p, session.getContextCredentialsProviders());
+
+        DBPPropertySource credentialsSource = authModel.createCredentialsSource(dataSourceContainer, configWithAuth);
+        return Arrays.stream(credentialsSource.getProperties())
+            .filter(predicate)
+            .map(p -> new WebPropertyInfo(session, p, credentialsSource)).toArray(WebPropertyInfo[]::new);
+    }
+
+    @Property
+    public List<WebNetworkHandlerConfig> getNetworkHandlersConfig() {
+        return dataSourceContainer.getConnectionConfiguration().getHandlers().stream()
+            .map(WebNetworkHandlerConfig::new).collect(Collectors.toList());
+    }
+
+    @Property
+    public Map<String, Object> getCredentials() {
+        //dataSourceContainer.getConnectionConfiguration().getCredentialsProvider().getCredentials();
+        return null;
+    }
+
+    public Map<String, Object> getSavedAuthProperties() {
+        return savedAuthProperties;
+    }
+
+    public List<WebNetworkHandlerConfigInput> getSavedNetworkCredentials() {
+        return savedNetworkCredentials;
+    }
+
+    public void setSavedCredentials(Map<String, Object> authProperties, List<WebNetworkHandlerConfigInput> networkCredentials) {
+        this.savedAuthProperties = authProperties;
+        this.savedNetworkCredentials = networkCredentials;
+    }
+
+    public void clearSavedCredentials() {
+        this.savedAuthProperties = null;
+        this.savedNetworkCredentials = null;
+    }
+
+    @Property
+    public Map<String, String> getProviderProperties() {
+        return dataSourceContainer.getConnectionConfiguration().getProviderProperties();
+    }
+
+    @Override
+    public String toString() {
+        return "WebConnection:" + dataSourceContainer.toString();
+    }
+
+    @Property
+    public boolean isCanViewSettings() {
+        return canViewReadOnlyConnections();
+    }
+
+    @Property
+    public boolean isCanEdit() {
+        return hasProjectPermission(RMProjectPermission.DATA_SOURCES_EDIT);
+    }
+
+    @Property
+    public boolean isCanDelete() {
+        return isCanEdit();
+    }
+
+    @Property
+    public String getProjectId() {
+        return dataSourceContainer.getProject().getId();
+    }
+
+    @Property
+    public String getRequiredAuth() {
+        return dataSourceContainer.getRequiredExternalAuth();
+    }
+
+    private boolean hasProjectPermission(RMProjectPermission projectPermission) {
+        DBPProject project = dataSourceContainer.getProject();
+        if (!(project instanceof WebProjectImpl)) {
+            return false;
+        }
+        return SMUtils.hasProjectPermission(session, ((WebProjectImpl) project).getRmProject(), projectPermission);
+    }
+
+    private boolean canViewReadOnlyConnections() {
+        if (isCanEdit()) {
+            return true;
+        }
+        BaseWebAppConfiguration appConfig = (BaseWebAppConfiguration) WebAppUtils.getWebApplication().getAppConfiguration();
+        return appConfig.isShowReadOnlyConnectionInfo();
+
+    }
+}

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

@@ -0,0 +1,91 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DBWebException;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.WebCommonUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPDataSourceOrigin;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.meta.Property;
+
+import java.util.Map;
+
+/**
+ * Web connection origin info
+ */
+public class WebConnectionOriginInfo implements WebObjectOrigin {
+
+    private final WebSession session;
+    private final DBPDataSourceContainer dataSourceContainer;
+    private final DBPDataSourceOrigin origin;
+
+    public WebConnectionOriginInfo(WebSession session, DBPDataSourceContainer dataSourceContainer, DBPDataSourceOrigin origin) {
+        this.session = session;
+        this.dataSourceContainer = dataSourceContainer;
+        this.origin = origin;
+    }
+
+    @NotNull
+    @Override
+    public String getType() {
+        return origin.getType();
+    }
+
+    @Nullable
+    @Override
+    public String getSubType() {
+        return origin.getSubType();
+    }
+
+    @NotNull
+    @Override
+    public String getDisplayName() {
+        return origin.getDisplayName();
+    }
+
+    @Nullable
+    @Override
+    public String getIcon() {
+        return WebCommonUtils.makeIconId(origin.getIcon());
+    }
+
+    @NotNull
+    @Override
+    public Map<String, Object> getConfiguration() {
+        return origin.getDataSourceConfiguration();
+    }
+
+    @Property
+    @Override
+    public WebPropertyInfo[] getDetails() throws DBWebException {
+        try {
+            DBPObject details = origin.getObjectDetails(session.getProgressMonitor(), session.getSessionContext(), dataSourceContainer);
+            if (details == null) {
+                return new WebPropertyInfo[0];
+            }
+            return WebCommonUtils.getObjectProperties(session, details);
+        } catch (DBException e) {
+            throw new DBWebException("Error reading origin details", e);
+        }
+    }
+
+}

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

@@ -0,0 +1,81 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.code.NotNull;
+import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
+import org.jkiss.dbeaver.model.net.DBWHandlerType;
+import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.Map;
+
+/**
+ * Web network handler info
+ */
+public class WebNetworkHandlerConfig {
+
+    private final DBWHandlerConfiguration configuration;
+
+    public WebNetworkHandlerConfig(DBWHandlerConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    public DBWHandlerType getType() {
+        return configuration.getType();
+    }
+
+    public boolean isSecured() {
+        return configuration.isSecured();
+    }
+
+    @NotNull
+    public String getId() {
+        return configuration.getId();
+    }
+
+    public boolean isEnabled() {
+        return configuration.isEnabled();
+    }
+
+    public SSHConstants.AuthType getAuthType() {
+        return CommonUtils.valueOf(SSHConstants.AuthType.class, configuration.getStringProperty(SSHConstants.PROP_AUTH_TYPE), SSHConstants.AuthType.PASSWORD);
+    }
+
+    public String getUserName() {
+        return configuration.getUserName();
+    }
+
+    public String getPassword() {
+        return CommonUtils.isEmpty(configuration.getPassword()) ? null : "";
+    }
+
+
+    public String getKey() {
+        return CommonUtils.isEmpty(configuration.getSecureProperty(SSHConstants.PROP_KEY_VALUE)) ? null : "";
+    }
+
+    public boolean isSavePassword() {
+        return configuration.isSavePassword();
+    }
+
+    @NotNull
+    public Map<String, Object> getProperties() {
+        return configuration.getProperties();
+    }
+
+}

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

@@ -0,0 +1,80 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.data.json.JSONUtils;
+import org.jkiss.dbeaver.model.net.DBWHandlerType;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.Map;
+
+/**
+ * Web network handler info
+ */
+public class WebNetworkHandlerConfigInput {
+
+    private final Map<String, Object> cfg;
+
+    public WebNetworkHandlerConfigInput(Map<String, Object> cfg) {
+        this.cfg = cfg;
+    }
+
+    public DBWHandlerType getType() {
+        return CommonUtils.valueOf(DBWHandlerType.class, JSONUtils.getString(cfg, "type"), null);
+    }
+
+    public String getId() {
+        return JSONUtils.getString(cfg, "id");
+    }
+
+    public Boolean isEnabled() {
+        if (cfg.containsKey("enabled")) {
+            return JSONUtils.getBoolean(cfg, "enabled");
+        } else {
+            return null;
+        }
+    }
+
+    public String getAuthType() {
+        return JSONUtils.getString(cfg, "authType");
+    }
+
+    public String getUserName() {
+        return JSONUtils.getString(cfg, "userName");
+    }
+
+    public String getPassword() {
+        return JSONUtils.getString(cfg, "password");
+    }
+
+    public String getKey() {
+        return JSONUtils.getString(cfg, "key");
+    }
+
+    public Boolean isSavePassword() {
+        if (cfg.containsKey("savePassword")) {
+            return JSONUtils.getBoolean(cfg, "savePassword");
+        } else {
+            return null;
+        }
+    }
+
+    public Map<String, Object> getProperties() {
+        return JSONUtils.getObjectOrNull(cfg, "properties");
+    }
+
+}

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

@@ -0,0 +1,49 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DBWebException;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.meta.Property;
+
+import java.util.Map;
+
+/**
+ * Object origin info
+ */
+public interface WebObjectOrigin {
+
+    @NotNull
+    public String getType();
+
+    @Nullable
+    public String getSubType();
+
+    @NotNull
+    public String getDisplayName();
+
+    @Nullable
+    public String getIcon();
+
+    @NotNull
+    public Map<String, Object> getConfiguration();
+
+    @Property
+    public WebPropertyInfo[] getDetails() throws DBWebException;
+
+}

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

@@ -0,0 +1,111 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.service.security.SMUtils;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.rm.RMProjectPermission;
+import org.jkiss.dbeaver.model.rm.RMProjectType;
+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;
+    private final WebProjectImpl project;
+    private final boolean customPrivateConnectionsEnabled;
+
+    public WebProjectInfo(WebSession session, WebProjectImpl project, boolean customPrivateConnectionsEnabled) {
+        this.session = session;
+        this.project = project;
+        this.customPrivateConnectionsEnabled = customPrivateConnectionsEnabled;
+    }
+
+    public WebSession getSession() {
+        return session;
+    }
+
+    public DBPProject getProject() {
+        return project;
+    }
+
+    @Property
+    public String getId() {
+        return project.getId();
+    }
+
+    @Property
+    public boolean isGlobal() { return project.getRmProject().isGlobal(); }
+
+    @Property
+    public boolean isShared() {
+        return project.getRmProject().isShared();
+    }
+
+    @Property
+    public String getName() {
+        return project.getName();
+    }
+
+    @Property
+    public String getDescription() {
+        return null;
+    }
+
+    @Property
+    public boolean isCanEditDataSources() {
+        if (project.getRmProject().getType() == RMProjectType.USER && !customPrivateConnectionsEnabled) {
+            return false;
+        }
+        return hasDataSourcePermission(RMProjectPermission.DATA_SOURCES_EDIT);
+    }
+
+    @Property
+    public boolean isCanViewDataSources() {
+        return hasDataSourcePermission(RMProjectPermission.DATA_SOURCES_VIEW);
+    }
+
+    @Property
+    public boolean isCanEditResources() {
+        return hasDataSourcePermission(RMProjectPermission.RESOURCE_EDIT);
+    }
+
+    @Property
+    public boolean isCanViewResources() {
+        return hasDataSourcePermission(RMProjectPermission.RESOURCE_VIEW);
+    }
+
+    private boolean hasDataSourcePermission(RMProjectPermission permission) {
+        return SMUtils.hasProjectPermission(session, project.getRmProject(), permission);
+    }
+
+    @Property
+    public RMResourceType[] getResourceTypes() {
+        RMResourceType[] resourceTypes = project.getRmProject().getResourceTypes();
+
+        if(resourceTypes == null) {
+            return ArrayUtils.toArray(RMResourceType.class, new ArrayList<>());
+        }
+
+        return resourceTypes;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,8 +20,11 @@ import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.*;
+import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
+import org.jkiss.dbeaver.model.impl.ProviderPropertyDescriptor;
 import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider;
 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.runtime.properties.ObjectPropertyDescriptor;
@@ -57,7 +60,8 @@ public class WebPropertyInfo {
     public void setShowProtected(boolean showProtected) {
         this.showProtected = showProtected;
     }
-///////////////////////////////////
+
+    ///////////////////////////////////
     // General properties
     ///////////////////////////////////
 
@@ -84,6 +88,11 @@ public class WebPropertyInfo {
         }
     }
 
+    @Property
+    public int getOrder() {
+        return property instanceof ObjectPropertyDescriptor ? ((ObjectPropertyDescriptor) property).getOrderNumber() : -1;
+    }
+
     @Property
     public String getCategory() {
         return property.getCategory();
@@ -100,6 +109,11 @@ public class WebPropertyInfo {
         return dataType == null ? null : dataType.getSimpleName();
     }
 
+    @Property
+    public PropertyLength getLength() {
+        return property.getLength();
+    }
+
     @Property
     public Object getDefaultValue() throws DBException {
         return property.getDefaultValue();
@@ -107,13 +121,16 @@ public class WebPropertyInfo {
 
     @Property
     public Object getValue() throws DBException {
+        Object value = propertySource == null ? null : propertySource.getPropertyValue(session.getProgressMonitor(), property.getId());
         if (property instanceof ObjectPropertyDescriptor) {
-            ObjectPropertyDescriptor opd = (ObjectPropertyDescriptor)property;
+            ObjectPropertyDescriptor opd = (ObjectPropertyDescriptor) property;
             if (!showProtected && opd.isPassword() || opd.isHidden()) {
+                if (value == null || value.toString().isEmpty()) {
+                    return "";
+                }
                 return "******";
             }
         }
-        Object value = propertySource == null ? null : propertySource.getPropertyValue(session.getProgressMonitor(), property.getId());
         return value == null ? null : makePropertyValue(value);
     }
 
@@ -140,6 +157,16 @@ public class WebPropertyInfo {
         return features == null ? new String[0] : features;
     }
 
+    @Property
+    public String[] getSupportedConfigurationTypes() {
+        if (property instanceof ProviderPropertyDescriptor) {
+            return ((ProviderPropertyDescriptor) property).getConfigurationTypes().stream()
+                .map(DBPDriverConfigurationType::toString)
+                .toArray(String[]::new);
+        }
+        return new String[0];
+    }
+
     public boolean hasFeature(@NotNull String feature) {
         return property.hasFeature(feature);
     }
@@ -189,7 +216,7 @@ public class WebPropertyInfo {
             return basicInfo;
         } else if (value instanceof Collection) {
             List<Object> result = new ArrayList<>();
-            for (Object item : (Collection)value) {
+            for (Object item : (Collection<?>)value) {
                 result.add(makePropertyValue(item));
             }
             return result;

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,7 +16,9 @@
  */
 package io.cloudbeaver.model;
 
+import io.cloudbeaver.DBWebException;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.sql.DBQuotaException;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,6 +30,7 @@ public class WebServerError {
 
     private String message;
     private String stackTrace;
+    private String errorType;
     private String errorCode;
 
     public WebServerError(Throwable ex) {
@@ -38,6 +41,9 @@ public class WebServerError {
         if (ex instanceof DBException) {
             errorCode = String.valueOf(((DBException) ex).getErrorCode());
         }
+        if (ex instanceof DBQuotaException) {
+            errorType = DBWebException.ERROR_CODE_QUOTA_EXCEEDED;
+        }
     }
 
     public String getMessage() {
@@ -52,4 +58,12 @@ public class WebServerError {
         return errorCode;
     }
 
+    public String getErrorType() {
+        return errorType;
+    }
+
+    public WebServerError getCausedBy() {
+        return null;
+    }
+
 }

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2020 DBeaver Corp and others
+ * Copyright (C) 2010-2023 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,7 +16,13 @@
  */
 package io.cloudbeaver.model;
 
-import io.cloudbeaver.server.CBConstants;
+import io.cloudbeaver.utils.CBModelConstants;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 
 /**
  * Web server message
@@ -32,13 +38,24 @@ public class WebServerMessage {
     }
 
     private final MessageType type;
-    private long time;
-    private String message;
+    private final Instant time;
+    private final String message;
+    private final Throwable error;
+
 
     public WebServerMessage(MessageType type, String message) {
+        this(type, message, null);
+    }
+
+    public WebServerMessage(Throwable error) {
+        this(MessageType.ERROR, error.getMessage(), error);
+    }
+
+    public WebServerMessage(MessageType type, String message, Throwable error) {
         this.type = type;
-        this.time = System.currentTimeMillis();
+        this.time = Instant.now();
         this.message = message;
+        this.error = error;
     }
 
     public MessageType getType() {
@@ -46,7 +63,7 @@ public class WebServerMessage {
     }
 
     public String getTime() {
-        return CBConstants.ISO_DATE_FORMAT.format(time);
+        return CBModelConstants.ISO_DATE_FORMAT.format(time);
     }
 
     public String getMessage() {
@@ -54,6 +71,11 @@ public class WebServerMessage {
     }
 
     public String getStackTrace() {
+        if (error != null) {
+            StringWriter buf = new StringWriter();
+            error.printStackTrace(new PrintWriter(buf, true));
+            return buf.toString();
+        }
         return null;
     }
 

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

@@ -0,0 +1,144 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.annotations.Expose;
+import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
+import io.cloudbeaver.registry.WebAuthProviderDescriptor;
+import io.cloudbeaver.registry.WebAuthProviderRegistry;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+import org.jkiss.utils.ArrayUtils;
+
+import java.util.*;
+
+public abstract class BaseAuthWebAppConfiguration extends BaseWebAppConfiguration implements WebAuthConfiguration {
+    private String defaultAuthProvider;
+    private String[] enabledAuthProviders;
+    private final Set<SMAuthProviderCustomConfiguration> authConfigurations;
+    // Legacy auth configs, left for backward compatibility
+    @Expose(serialize = false)
+    private final Map<String, SMAuthProviderCustomConfiguration> authConfiguration;
+
+    public BaseAuthWebAppConfiguration() {
+        super();
+        this.defaultAuthProvider = LocalAuthProviderConstants.PROVIDER_ID;
+        this.enabledAuthProviders = null;
+        this.authConfigurations = new LinkedHashSet<>();
+        this.authConfiguration = new LinkedHashMap<>();
+    }
+
+    public BaseAuthWebAppConfiguration(BaseAuthWebAppConfiguration src) {
+        super(src);
+        this.defaultAuthProvider = src.defaultAuthProvider;
+        this.enabledAuthProviders = src.enabledAuthProviders;
+        this.authConfigurations = new LinkedHashSet<>(src.authConfigurations);
+        this.authConfiguration = new LinkedHashMap<>(src.authConfiguration);
+    }
+
+    @Override
+    public String getDefaultAuthProvider() {
+        return defaultAuthProvider;
+    }
+
+    public void setDefaultAuthProvider(String defaultAuthProvider) {
+        this.defaultAuthProvider = defaultAuthProvider;
+    }
+
+    @Override
+    public String[] getEnabledAuthProviders() {
+        if (enabledAuthProviders == null) {
+            // No config - enable all providers (+backward compatibility)
+            return WebAuthProviderRegistry.getInstance().getAuthProviders()
+                .stream().map(WebAuthProviderDescriptor::getId).toArray(String[]::new);
+        }
+        return enabledAuthProviders;
+    }
+
+    public void setEnabledAuthProviders(String[] enabledAuthProviders) {
+        this.enabledAuthProviders = enabledAuthProviders;
+    }
+
+
+    @Override
+    public boolean isAuthProviderEnabled(String id) {
+        var authProviderDescriptor = WebAuthProviderRegistry.getInstance().getAuthProvider(id);
+        if (authProviderDescriptor == null) {
+            return false;
+        }
+
+        if (!ArrayUtils.contains(getEnabledAuthProviders(), id)) {
+            return false;
+        }
+        if (!ArrayUtils.isEmpty(authProviderDescriptor.getRequiredFeatures())) {
+            for (String rf : authProviderDescriptor.getRequiredFeatures()) {
+                if (!isFeatureEnabled(rf)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    ////////////////////////////////////////////
+    // Auth provider configs
+    @Override
+    public Set<SMAuthProviderCustomConfiguration> getAuthCustomConfigurations() {
+        return authConfigurations;
+    }
+
+    @Override
+    @Nullable
+    public SMAuthProviderCustomConfiguration getAuthProviderConfiguration(@NotNull String id) {
+        synchronized (authConfigurations) {
+            return authConfigurations.stream().filter(c -> c.getId().equals(id)).findAny().orElse(null);
+        }
+    }
+
+    public void addAuthProviderConfiguration(@NotNull SMAuthProviderCustomConfiguration config) {
+        synchronized (authConfigurations) {
+            authConfigurations.removeIf(c -> c.getId().equals(config.getId()));
+            authConfigurations.add(config);
+        }
+    }
+
+    public void setAuthProvidersConfigurations(Collection<SMAuthProviderCustomConfiguration> authProviders) {
+        synchronized (authConfigurations) {
+            authConfigurations.clear();
+            authConfigurations.addAll(authProviders);
+        }
+    }
+
+    public boolean deleteAuthProviderConfiguration(@NotNull String id) {
+        synchronized (authConfigurations) {
+            return authConfigurations.removeIf(c -> c.getId().equals(id));
+        }
+    }
+
+    public void loadLegacyCustomConfigs() {
+        // Convert legacy map of configs into list
+        if (!authConfiguration.isEmpty()) {
+            for (Map.Entry<String, SMAuthProviderCustomConfiguration> entry : authConfiguration.entrySet()) {
+                entry.getValue().setId(entry.getKey());
+                authConfigurations.add(entry.getValue());
+            }
+            authConfiguration.clear();
+        }
+    }
+}

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

@@ -0,0 +1,108 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DBWFeatureSet;
+import io.cloudbeaver.registry.WebFeatureRegistry;
+import org.jkiss.code.NotNull;
+import org.jkiss.utils.ArrayUtils;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+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 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;
+    }
+
+    public BaseWebAppConfiguration(BaseWebAppConfiguration src) {
+        this.plugins = new LinkedHashMap<>(src.plugins);
+        this.defaultUserTeam = src.defaultUserTeam;
+        this.resourceManagerEnabled = src.resourceManagerEnabled;
+        this.enabledFeatures = src.enabledFeatures;
+        this.showReadOnlyConnectionInfo = src.showReadOnlyConnectionInfo;
+    }
+
+    @Override
+    public String getDefaultUserTeam() {
+        return defaultUserTeam;
+    }
+
+    @Override
+    public <T> T getPluginOption(@NotNull String pluginId, @NotNull String option) {
+        return (T) getPluginConfig(pluginId, false).get(option);
+    }
+
+    @Override
+    public Map<String, Object> getPluginConfig(@NotNull String pluginId, boolean create) {
+        Object config = plugins.get(pluginId);
+        if (config instanceof Map) {
+            return (Map<String, Object>) config;
+        } else {
+            if (create) {
+                Map<String, Object> newConfig = new LinkedHashMap<>();
+                plugins.put(pluginId, newConfig);
+                return newConfig;
+            } else {
+                return Collections.emptyMap();
+            }
+        }
+    }
+
+    @Override
+    public boolean isResourceManagerEnabled() {
+        return resourceManagerEnabled;
+    }
+
+    public boolean isFeatureEnabled(String id) {
+        return ArrayUtils.contains(getEnabledFeatures(), id);
+    }
+
+    public boolean isFeaturesEnabled(String[] features) {
+        return ArrayUtils.containsAll(getEnabledFeatures(), features);
+    }
+
+    public String[] getEnabledFeatures() {
+        if (enabledFeatures == null) {
+            // No config - enable all features (+backward compatibility)
+            return WebFeatureRegistry.getInstance().getWebFeatures()
+                .stream().map(DBWFeatureSet::getId).toArray(String[]::new);
+        }
+        return enabledFeatures;
+    }
+
+    public void setEnabledFeatures(String[] enabledFeatures) {
+        this.enabledFeatures = enabledFeatures;
+    }
+
+    public boolean isShowReadOnlyConnectionInfo() {
+        return showReadOnlyConnectionInfo;
+    }
+}

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

@@ -0,0 +1,257 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DataSourceFilter;
+import io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.log.SLF4JLogHandler;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.WebGlobalWorkspace;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.app.IApplicationContext;
+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.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.data.json.JSONUtils;
+import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
+import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.secret.DBSSecretController;
+import org.jkiss.dbeaver.model.websocket.event.WSEventController;
+import org.jkiss.dbeaver.registry.BaseApplicationImpl;
+import org.jkiss.dbeaver.runtime.IVariableResolver;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.dbeaver.utils.RuntimeUtils;
+import org.jkiss.utils.CommonUtils;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Web application
+ */
+public abstract class BaseWebApplication extends BaseApplicationImpl implements WebApplication {
+
+    public static final String DEFAULT_CONFIG_FILE_PATH = "/etc/cloudbeaver.conf";
+    public static final String CUSTOM_CONFIG_FOLDER = "custom";
+    public static final String CLI_PARAM_WEB_CONFIG = "-web-config";
+    public static final String LOGBACK_FILE_NAME = "logback.xml";
+
+
+    private static final Log log = Log.getLog(BaseWebApplication.class);
+
+    @NotNull
+    @Override
+    public DBPWorkspace createWorkspace(@NotNull DBPPlatform platform, @NotNull IWorkspace eclipseWorkspace) {
+        return new WebGlobalWorkspace(platform, eclipseWorkspace);
+    }
+
+    @Override
+    public RMController createResourceController(@NotNull SMCredentialsProvider credentialsProvider,
+                                                 @NotNull DBPWorkspace workspace) throws DBException {
+        throw new IllegalStateException("Resource controller is not supported by " + getClass().getSimpleName());
+    }
+
+    @NotNull
+    @Override
+    public DBFileController createFileController(@NotNull SMCredentialsProvider credentialsProvider) {
+        throw new IllegalStateException("File controller is not supported by " + getClass().getSimpleName());
+    }
+
+    @Nullable
+    @Override
+    public Path getDefaultWorkingFolder() {
+        return null;
+    }
+
+    @Override
+    public boolean isHeadlessMode() {
+        return true;
+    }
+
+    @Override
+    public boolean isMultiuser() {
+        return true;
+    }
+
+    @Nullable
+    protected Path loadServerConfiguration() throws DBException {
+        Path configFilePath = getMainConfigurationFilePath().toAbsolutePath();
+        Path configFolder = configFilePath.getParent();
+
+        // Configure logging
+        Path logbackConfigPath = getLogbackConfigPath(configFolder);
+
+        if (logbackConfigPath == null) {
+            System.err.println("Can't find slf4j configuration file in " + configFilePath.getParent());
+        } else {
+            System.setProperty("logback.configurationFile", logbackConfigPath.toString());
+        }
+        Log.setLogHandler(new SLF4JLogHandler());
+
+        // Load config file
+        log.debug("Loading configuration from " + configFilePath);
+        try {
+            loadConfiguration(configFilePath);
+        } catch (Exception e) {
+            log.error("Error parsing configuration", e);
+            return null;
+        }
+
+        return configFilePath;
+    }
+
+    @Nullable
+    private Path getLogbackConfigPath(Path path) {
+        // try to find custom logback.xml file
+        Path logbackConfigPath = getCustomConfigPath(path, LOGBACK_FILE_NAME);
+        if (Files.exists(logbackConfigPath)) {
+            return logbackConfigPath;
+        }
+        for (Path confFolder = path; confFolder != null; confFolder = confFolder.getParent()) {
+            Path lbFile = confFolder.resolve(LOGBACK_FILE_NAME);
+            if (Files.exists(lbFile)) {
+                return lbFile;
+            }
+        }
+        return null;
+    }
+
+    private Path getMainConfigurationFilePath() {
+        String configPath = DEFAULT_CONFIG_FILE_PATH;
+
+        String[] args = Platform.getCommandLineArgs();
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equals(CLI_PARAM_WEB_CONFIG) && args.length > i + 1) {
+                configPath = args[i + 1];
+                break;
+            }
+        }
+        // try fo find custom config path (it is used mostly for docker volumes)
+        Path configFilePath = Path.of(configPath);
+
+        Path customConfigPath = getCustomConfigPath(configFilePath.getParent(), configFilePath.getFileName().toString());
+        if (Files.exists(customConfigPath)) {
+            return customConfigPath;
+        }
+        return configFilePath;
+    }
+
+    @NotNull
+    private Path getCustomConfigPath(Path configPath, String fileName) {
+        var customConfigPath = configPath.resolve(CUSTOM_CONFIG_FOLDER).resolve(fileName);
+        return Files.exists(customConfigPath) ? customConfigPath : configPath.resolve(fileName);
+    }
+
+    protected abstract void loadConfiguration(Path configPath) throws DBException;
+
+    @Override
+    public WebProjectImpl createProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter
+    ) {
+        return new WebProjectImpl(
+            webSession.getWorkspace(),
+            webSession.getRmController(),
+            webSession.getSessionContext(),
+            project,
+            dataSourceFilter
+        );
+    }
+
+    /**
+     * There is no secret controller in base web app.
+     * Method returns VoidSecretController instance.
+     * Advanced apps may implement it differently.
+     */
+    @Override
+    public DBSSecretController getSecretController(@NotNull SMCredentialsProvider credentialsProvider)  throws DBException {
+        return VoidSecretController.INSTANCE;
+    }
+
+    protected Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
+        return JSONUtils.getObject(configProps, "server");
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void patchConfigurationWithProperties(Map<String, Object> configProps, IVariableResolver varResolver) {
+        for (Map.Entry<String, Object> entry : configProps.entrySet()) {
+            Object propValue = entry.getValue();
+            if (propValue instanceof String) {
+                entry.setValue(GeneralUtils.replaceVariables((String) propValue, varResolver));
+            } else if (propValue instanceof Map) {
+                patchConfigurationWithProperties((Map<String, Object>) propValue, varResolver);
+            } else if (propValue instanceof List) {
+                List value = (List) propValue;
+                for (int i = 0; i < value.size(); i++) {
+                    Object colItem = value.get(i);
+                    if (colItem instanceof String) {
+                        value.set(i, GeneralUtils.replaceVariables((String) colItem, varResolver));
+                    } else if (colItem instanceof Map) {
+                        patchConfigurationWithProperties((Map<String, Object>) colItem, varResolver);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public Object start(IApplicationContext context) {
+        try {
+            startServer();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    protected abstract void startServer() throws DBException;
+
+    @Override
+    public String getApplicationInstanceId() throws DBException {
+        try {
+            byte[] macAddress = RuntimeUtils.getLocalMacAddress();
+            String appId = ApplicationRegistry.getInstance().getApplication().getId();
+            return appId + "_" + CommonUtils.toHexString(macAddress) + getServerPort();
+        } catch (Exception e) {
+            throw new DBException("Error during generation instance id generation", e);
+        }
+    }
+
+    public String getApplicationId() {
+        try {
+            return getApplicationInstanceId();
+        } catch (DBException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public WSEventController getEventController() {
+        return null;
+    }
+
+}

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

@@ -0,0 +1,50 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.secret.DBSSecretController;
+
+/**
+ * Void secret controller.
+ */
+public class VoidSecretController implements DBSSecretController {
+
+    public static final VoidSecretController INSTANCE = new VoidSecretController();
+
+    public VoidSecretController() {
+
+    }
+
+    @Nullable
+    @Override
+    public String getSecretValue(@NotNull String secretId) {
+        return null;
+    }
+
+    @Override
+    public void setSecretValue(@NotNull String secretId, @Nullable String secretValue) throws DBException {
+        throw new DBException("Secret controller is read-only");
+    }
+
+    @Override
+    public void flushChanges() {
+    }
+
+}

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

@@ -0,0 +1,48 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.code.NotNull;
+
+import java.util.Map;
+
+/**
+ * Application configuration
+ */
+public interface WebAppConfiguration {
+    String getAnonymousUserTeam();
+
+    boolean isAnonymousAccessEnabled();
+
+    <T> T getResourceQuota(String quotaId);
+
+    String getDefaultUserTeam();
+
+    <T> T getPluginOption(@NotNull String pluginId, @NotNull String option);
+
+    Map<String, Object> getPluginConfig(@NotNull String pluginId, boolean create);
+
+    boolean isResourceManagerEnabled();
+
+    boolean isFeaturesEnabled(String[] requiredFeatures);
+
+    boolean isFeatureEnabled(String id);
+
+    default boolean isSupportsCustomConnections() {
+        return true;
+    }
+}

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

@@ -0,0 +1,89 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.DataSourceFilter;
+import io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+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.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+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.websocket.event.WSEventController;
+
+import java.nio.file.Path;
+
+/**
+ * Base interface for web application
+ */
+public interface WebApplication extends DBPApplication {
+    boolean isConfigurationMode();
+
+    WebAppConfiguration getAppConfiguration();
+
+    Path getDataDirectory(boolean create);
+
+    Path getWorkspaceDirectory();
+
+    Path getHomeDirectory();
+
+    boolean isMultiNode();
+
+    WebProjectImpl createProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter);
+
+    SMController createSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
+
+    SMAdminController getAdminSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
+
+    DBSSecretController getSecretController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
+
+    RMController createResourceController(@NotNull SMCredentialsProvider credentialsProvider,
+                                          @NotNull DBPWorkspace workspace) throws DBException;
+
+    DBFileController createFileController(@NotNull SMCredentialsProvider credentialsProvider);
+
+    String getServerURL();
+
+    default String getServicesURI() {
+        return "/";
+    }
+
+    default String getRootURI() {
+        return "";
+    }
+
+    String getApplicationInstanceId() throws DBException;
+
+    WSEventController getEventController();
+
+    /**
+     * Port this server listens on
+     */
+    int getServerPort();
+
+    boolean isLicenseRequired();
+}

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

@@ -0,0 +1,30 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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 io.cloudbeaver.auth.CBAuthConstants;
+
+public interface WebAuthApplication extends WebApplication {
+    WebAuthConfiguration getAuthConfiguration();
+
+    String getAuthServiceURL();
+
+    default long getMaxSessionIdleTime() {
+        return CBAuthConstants.MAX_SESSION_IDLE_TIME;
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.model.security.SMAuthProviderCustomConfiguration;
+
+import java.util.Set;
+
+/**
+ * Application authentication configuration
+ */
+public interface WebAuthConfiguration {
+
+    String getDefaultAuthProvider();
+
+    String[] getEnabledAuthProviders();
+
+    boolean isAuthProviderEnabled(String authProviderId);
+
+    Set<SMAuthProviderCustomConfiguration> getAuthCustomConfigurations();
+
+    SMAuthProviderCustomConfiguration getAuthProviderConfiguration(String configId);
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/log/SLF4JLogHandler.java

@@ -0,0 +1,136 @@
+package io.cloudbeaver.model.log;
+
+import org.jkiss.dbeaver.LogHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SLF4JLogHandler implements LogHandler {
+    private static final Map<String, Logger> loggers = new ConcurrentHashMap<>();
+
+    @Override
+    public String getName(String name) {
+        return name;
+    }
+
+    @Override
+    public boolean isDebugEnabled(String name) {
+        return getLogger(name).isDebugEnabled();
+    }
+
+    @Override
+    public boolean isErrorEnabled(String name) {
+        return getLogger(name).isErrorEnabled();
+    }
+
+    @Override
+    public boolean isFatalEnabled(String name) {
+        return isErrorEnabled(name);
+    }
+
+    @Override
+    public boolean isInfoEnabled(String name) {
+        return getLogger(name).isInfoEnabled();
+    }
+
+    @Override
+    public boolean isTraceEnabled(String name) {
+        return getLogger(name).isTraceEnabled();
+    }
+
+    @Override
+    public boolean isWarnEnabled(String name) {
+        return getLogger(name).isWarnEnabled();
+    }
+
+    @Override
+    public void trace(String name, Object message) {
+        var logger = getLogger(name);
+        if (message instanceof Throwable) {
+            logger.trace(message.toString(), (Throwable) message);
+        } else {
+            logger.trace(message.toString());
+        }
+    }
+
+    @Override
+    public void trace(String name, Object message, Throwable t) {
+        getLogger(name).trace(message.toString(), t);
+    }
+
+    @Override
+    public void debug(String name, Object message) {
+        var logger = getLogger(name);
+        if (message instanceof Throwable) {
+            logger.debug(message.toString(), (Throwable) message);
+        } else {
+            logger.debug(message.toString());
+        }
+    }
+
+    @Override
+    public void debug(String name, Object message, Throwable t) {
+        getLogger(name).debug(message.toString(), t);
+    }
+
+    @Override
+    public void info(String name, Object message) {
+        var logger = getLogger(name);
+        if (message instanceof Throwable) {
+            logger.info(message.toString(), (Throwable) message);
+        } else {
+            logger.info(message.toString());
+        }
+    }
+
+    @Override
+    public void info(String name, Object message, Throwable t) {
+        getLogger(name).info(message.toString(), t);
+    }
+
+    @Override
+    public void warn(String name, Object message) {
+        var logger = getLogger(name);
+        if (message instanceof Throwable) {
+            logger.warn(message.toString(), (Throwable) message);
+        } else {
+            logger.warn(message.toString());
+        }
+    }
+
+    @Override
+    public void warn(String name, Object message, Throwable t) {
+        getLogger(name).warn(message.toString(), t);
+    }
+
+    @Override
+    public void error(String name, Object message) {
+        var logger = getLogger(name);
+        if (message instanceof Throwable) {
+            logger.error(message.toString(), (Throwable) message);
+        } else {
+            logger.error(message == null ? null : message.toString());
+        }
+    }
+
+    @Override
+    public void error(String name, Object message, Throwable t) {
+        getLogger(name).error(message == null ? null : message.toString(), t);
+    }
+
+    @Override
+    public void fatal(String name, Object message) {
+        error(name, message);
+    }
+
+    @Override
+    public void fatal(String name, Object message, Throwable t) {
+        error(name, message, t);
+    }
+
+    private Logger getLogger(String loggerName) {
+        return loggers.computeIfAbsent(loggerName, LoggerFactory::getLogger);
+    }
+}

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

@@ -0,0 +1,64 @@
+package io.cloudbeaver.model.rm;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObjectWithDetails;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.rm.RMResource;
+import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
+import org.jkiss.utils.ArrayUtils;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Queue;
+
+public abstract class DBNAbstractResourceManagerNode extends DBNNode implements DBPObjectWithDetails {
+    protected DBNResourceManagerResource[] children;
+
+    public DBNAbstractResourceManagerNode(DBNNode parentNode) {
+        super(parentNode);
+    }
+
+    public void removeChildResourceNode(@NotNull Queue<RMResource> resourcePath) {
+        if (children == null || resourcePath.isEmpty()) {
+            return;
+        }
+        var expectedResource = resourcePath.poll();
+        var node = RMNavigatorUtils.findResourceNode(children, expectedResource);
+        if (node == null) {
+            return;
+        }
+
+        if (resourcePath.isEmpty()) { // we are in expected parent node
+            children = ArrayUtils.remove(DBNResourceManagerResource.class, children, node);
+        } else {
+            node.removeChildResourceNode(resourcePath);
+        }
+    }
+
+    public void addChildResourceNode(@NotNull Queue<RMResource> resourcePath) {
+        if (children == null) {
+            // initialize children
+            try {
+                getChildren(new VoidProgressMonitor());
+            } catch (DBException e) {
+                return;
+            }
+        }
+        if (resourcePath.isEmpty()) {
+            return;
+        }
+        var expectedResource = resourcePath.poll();
+        var node = RMNavigatorUtils.findResourceNode(children, expectedResource);
+        if (node == null) { // we are in expected parent node
+            DBNResourceManagerResource newResourceNode = new DBNResourceManagerResource(this, expectedResource);
+            children = ArrayUtils.add(DBNResourceManagerResource.class, children, newResourceNode);
+            Arrays.sort(children, Comparator.comparing(DBNNode::getName));
+            return;
+        }
+        if (resourcePath.size() > 0) {
+            node.addChildResourceNode(resourcePath);
+        }
+
+    }
+}

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

@@ -0,0 +1,144 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp
+ *
+ * All Rights Reserved.
+ *
+ * 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.
+ */
+
+package io.cloudbeaver.model.rm;
+
+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.DBIcon;
+import org.jkiss.dbeaver.model.DBPImage;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMResource;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
+    private static final Log log = Log.getLog(DBNResourceManagerProject.class);
+
+    private final RMProject project;
+
+    DBNResourceManagerProject(DBNResourceManagerRoot parentNode, RMProject project) {
+        super(parentNode);
+        this.project = project;
+    }
+
+    public RMProject getProject() {
+        return project;
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return project.getId();
+    }
+
+    @Override
+    public String getNodeType() {
+        return "rm.project";
+    }
+
+    @Override
+    public String getNodeName() {
+        return project.getDisplayName();
+    }
+
+    @Override
+    public String getLocalizedName(String locale) {
+        return getNodeName();
+    }
+
+    @Override
+    public String getNodeDescription() {
+        return project.getDescription();
+    }
+
+    @Override
+    public DBPImage getNodeIcon() {
+        return DBIcon.PROJECT;
+    }
+
+    @Override
+    protected boolean allowsChildren() {
+        return true;
+    }
+
+    @Override
+    public DBNResourceManagerResource[] getChildren(DBRProgressMonitor monitor) throws DBException {
+        if (children == null) {
+            List<DBNResourceManagerResource> rfList = new ArrayList<>();
+            for (RMResource resource : getResourceController().listResources(
+                project.getId(), null, null, true, false, false)) {
+
+                rfList.add(new DBNResourceManagerResource(this, resource));
+            }
+
+            children = rfList.toArray(new DBNResourceManagerResource[0]);
+        }
+        return children;
+    }
+
+    public RMController getResourceController() {
+        return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
+    }
+
+    @Override
+    public String getNodeItemPath() {
+        return getParentNode().getNodeItemPath() + "/" + getName();
+    }
+
+    @Override
+    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+        children = null;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return getNodeName();
+    }
+
+
+    @Override
+    public DBPProject getOwnerProject() {
+        List<? extends DBPProject> globalProjects = getModel().getModelProjects();
+        if (globalProjects == null) {
+            return null;
+        }
+        for (DBPProject modelProject : globalProjects) {
+            if (CommonUtils.equalObjects(modelProject.getId(), project.getId())) {
+                return modelProject;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public DBPObject getObjectDetails(@NotNull DBRProgressMonitor monitor, @NotNull SMSessionContext sessionContext, @NotNull Object dataSource) throws DBException {
+        return project;
+    }
+}

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

@@ -0,0 +1,213 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp
+ *
+ * All Rights Reserved.
+ *
+ * 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.
+ */
+
+package io.cloudbeaver.model.rm;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBIcon;
+import org.jkiss.dbeaver.model.DBPImage;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMResource;
+import org.jkiss.dbeaver.model.rm.RMResourceType;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.registry.ResourceTypeDescriptor;
+import org.jkiss.dbeaver.registry.ResourceTypeRegistry;
+import org.jkiss.utils.ArrayUtils;
+import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.IOUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
+
+    private final RMResource resource;
+
+    DBNResourceManagerResource(DBNNode parentNode, RMResource resource) {
+        super(parentNode);
+        this.resource = resource;
+    }
+
+    @Override
+    public String getNodeType() {
+        return "rm.resource";
+    }
+
+    @Override
+    public String getNodeName() {
+        return resource.getName();
+    }
+
+    @Override
+    public String getNodeDescription() {
+        return null;
+    }
+
+    @Override
+    public DBPImage getNodeIcon() {
+        if (resource.isFolder()) {
+            if (getParentNode() instanceof DBNResourceManagerResource) {
+                return DBIcon.TREE_FOLDER;
+            }
+            // It may be a special folder
+            ResourceTypeDescriptor folderResType = ResourceTypeRegistry.getInstance().getResourceTypeByRootPath(
+                getOwnerProject(),
+                getName()
+            );
+            if (folderResType != null) {
+                return folderResType.getFolderIcon();
+            }
+            return DBIcon.TREE_FOLDER;
+        } else {
+            var fileExtension = IOUtils.getFileExtension(getNodeName());
+            if (!CommonUtils.isEmpty(fileExtension)) {
+                RMProject project = getProjectNode();
+                if (project != null) {
+                    for (RMResourceType rt : project.getResourceTypes()) {
+                        if (ArrayUtils.contains(rt.getFileExtensions(), fileExtension)) {
+                            return new DBIcon(null, rt.getIcon());
+                        }
+                    }
+                }
+            }
+            return DBIcon.TREE_PAGE;
+        }
+    }
+
+    private RMProject getProjectNode() {
+        for (DBNNode node = this; node != null; node = node.getParentNode()) {
+            if (node instanceof DBNResourceManagerProject) {
+                return  ((DBNResourceManagerProject) node).getProject();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected boolean allowsChildren() {
+        return resource.isFolder();
+    }
+
+    @Override
+    public DBNNode[] getChildren(DBRProgressMonitor monitor) throws DBException {
+        if (children == null) {
+            List<DBNResourceManagerResource> rfList = new ArrayList<>();
+            for (RMResource resource : getResourceController().listResources(
+                getResourceProject().getId(), getResourceFolder(), null, true, false, false)) {
+                rfList.add(new DBNResourceManagerResource(this, resource));
+            }
+
+            children = rfList.toArray(new DBNResourceManagerResource[0]);
+        }
+        return children;
+    }
+
+    public String getResourceFolder() {
+        StringBuilder folder = new StringBuilder();
+        for (DBNNode parent = this; parent != null; parent = parent.getParentNode()) {
+            if (parent instanceof DBNResourceManagerResource) {
+                if (folder.length() > 0) folder.insert(0, '/');
+                folder.insert(0, parent.getName());
+            } else {
+                break;
+            }
+        }
+        return folder.length() == 0 ? null : folder.toString();
+    }
+
+    public RMProject getResourceProject() throws DBException {
+        for (DBNNode parent = getParentNode(); parent != null; parent = parent.getParentNode()) {
+            if (parent instanceof DBNResourceManagerProject) {
+                return ((DBNResourceManagerProject) parent).getProject();
+            }
+        }
+        throw new DBException("Can't detect resource project node");
+    }
+
+    protected RMController getResourceController() throws DBException {
+        for (DBNNode parent = getParentNode(); parent != null; parent = parent.getParentNode()) {
+            if (parent instanceof DBNResourceManagerRoot) {
+                return ((DBNResourceManagerRoot) parent).getResourceController();
+            }
+        }
+        throw new DBException("Can't detect resource root node");
+    }
+
+    @Override
+    public String getNodeItemPath() {
+        return getParentNode().getNodeItemPath() + "/" + getNodeName();
+    }
+
+    @Override
+    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+        this.children = null;
+        return super.refreshNode(monitor, source);
+    }
+    @Override
+    public boolean supportsRename() {
+        return true;
+    }
+
+    @Override
+    public void rename(DBRProgressMonitor monitor, String newName) throws DBException {
+        String resourceName = resource.getName();
+        try {
+            if (newName.indexOf('.') == -1) {
+                String ext = IOUtils.getFileExtension(getNodeName());
+                if (!CommonUtils.isEmpty(ext)) {
+                    newName += "." + ext;
+                }
+            }
+            if (!newName.equals(resource.getName())) {
+                String oldPath = getResourceFolder();
+                resource.setName(newName);
+                getResourceController().moveResource(getResourceProject().getId(), oldPath, getResourceFolder());
+
+            }
+        } catch (Exception e) {
+            resource.setName(resourceName);
+            throw new DBException("Can't rename resource", e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return getNodeName();
+    }
+
+    @Nullable
+    @Override
+    public DBPObject getObjectDetails(@NotNull DBRProgressMonitor monitor, @NotNull SMSessionContext sessionContext, @NotNull Object dataSource) throws DBException {
+        return resource;
+    }
+
+    @Override
+    public DBPProject getOwnerProject() {
+        return getParentNode().getOwnerProject();
+    }
+
+    public RMResource getResource() {
+        return resource;
+    }
+}

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

@@ -0,0 +1,157 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp
+ *
+ * All Rights Reserved.
+ *
+ * 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.
+ */
+
+package io.cloudbeaver.model.rm;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPHiddenObject;
+import org.jkiss.dbeaver.model.DBPImage;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.auth.SMSession;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.navigator.DBNRoot;
+import org.jkiss.dbeaver.model.rm.*;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.utils.ArrayUtils;
+
+import java.util.*;
+
+public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject, RMEventListener {
+
+    private DBNResourceManagerProject[] projects;
+    private RMController resourceController;
+
+    public DBNResourceManagerRoot(DBNRoot parentNode) {
+        super(parentNode);
+    }
+
+    public RMController getResourceController() {
+        return resourceController;
+    }
+
+    @Override
+    public String getNodeType() {
+        return "rm";
+    }
+
+    @Override
+    public String getNodeName() {
+        return "resources";
+    }
+
+    @Override
+    public String getNodeDescription() {
+        return "Resources";
+    }
+
+    @Override
+    public DBPImage getNodeIcon() {
+        return null;
+    }
+
+    @Override
+    protected boolean allowsChildren() {
+        return true;
+    }
+
+    @Override
+    public DBNResourceManagerProject[] getChildren(DBRProgressMonitor monitor) throws DBException {
+        if (projects == null) {
+            List<? extends DBPProject> projectList = getParentNode().getModel().getModelProjects();
+            SMSession session = null;
+            for (DBPProject project : projectList) {
+                session = getParentNode().getModel().getModelAuthContext().getSpaceSession(monitor, project.getWorkspace(), false);
+                if (session instanceof WebSession) {
+                    break;
+                }
+            }
+            if (!(session instanceof WebSession)) {
+                throw new DBException("Can't obtain credentials provider for resource manager");
+            }
+            List<DBNResourceManagerProject> projectNodes = new ArrayList<>();
+            resourceController = ((WebSession) session).getRmController();
+            RMEventManager.addEventListener(this);
+            for (RMProject project : resourceController.listAccessibleProjects()) {
+                projectNodes.add(new DBNResourceManagerProject(this, project));
+            }
+
+            projects = projectNodes.toArray(new DBNResourceManagerProject[0]);
+        }
+        return projects;
+    }
+
+    @Override
+    public String getNodeItemPath() {
+        // Path doesn't include project name
+        return NodePathType.ext.getPrefix() + getNodeName();
+    }
+
+    @Override
+    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+        projects = null;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return getNodeName();
+    }
+
+    @Override
+    public boolean isHidden() {
+        return true;
+    }
+
+    @Override
+    public void handleRMEvent(RMEvent event) {
+        var action = event.getAction();
+        switch (action) {
+            case RESOURCE_DELETE:
+                deleteResourceNode(event.getProject(), event.getResourceTree());
+                break;
+            case RESOURCE_ADD:
+                addResourceNode(event.getProject(), event.getResourceTree());
+                break;
+            case PROJECT_ADD:
+                addProjectNode(event.getProject());
+                break;
+        }
+    }
+
+    private void deleteResourceNode(RMProject project, List<RMResource> resourcePath) {
+        var projectNode = getProjectNode(project);
+        projectNode.ifPresent(dbnResourceManagerProject -> dbnResourceManagerProject.removeChildResourceNode(new ArrayDeque<>(resourcePath)));
+    }
+
+    @NotNull
+    private Optional<DBNResourceManagerProject> getProjectNode(RMProject project) {
+        return Arrays.stream(projects)
+            .filter(rmProjectNode -> rmProjectNode.getProject().getId().equals(project.getId()))
+            .findFirst();
+    }
+
+    private void addResourceNode(RMProject project, List<RMResource> resourcePath) {
+        var projectNode = getProjectNode(project);
+        projectNode.ifPresent(dbnResourceManagerProject -> dbnResourceManagerProject.addChildResourceNode(new ArrayDeque<>(resourcePath)));
+    }
+
+    private void addProjectNode(RMProject project) {
+        projects = ArrayUtils.add(DBNResourceManagerProject.class, projects, new DBNResourceManagerProject(this, project));
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.rm;
+
+import io.cloudbeaver.model.app.WebApplication;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.rm.RMController;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class RMControllerInvocationHandler implements InvocationHandler {
+    private final WebApplication webApplication;
+    private final RMController rmController;
+
+    public RMControllerInvocationHandler(RMController rmController, WebApplication webApplication) {
+        this.webApplication = webApplication;
+        this.rmController = rmController;
+    }
+
+    private void checkIsRmEnabled() throws DBException {
+        if (!webApplication.getAppConfiguration().isResourceManagerEnabled()) {
+            throw new DBException("Resource Manager disabled");
+        }
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        try {
+            checkIsRmEnabled();
+            return method.invoke(rmController, args);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+package io.cloudbeaver.model.rm;
+
+import org.jkiss.dbeaver.model.rm.RMResource;
+
+class RMNavigatorUtils {
+    public static DBNResourceManagerResource findResourceNode(DBNResourceManagerResource[] resourceNodes, RMResource expectedResource) {
+        DBNResourceManagerResource node = null;
+        for (DBNResourceManagerResource resourceNode : resourceNodes) {
+            var nodeResource = resourceNode.getResource();
+            if (nodeResource.getName().equals(expectedResource.getName()) && nodeResource.isFolder() == expectedResource.isFolder()) {
+                node = resourceNode;
+                break;
+            }
+        }
+        return node;
+    }
+}

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

@@ -0,0 +1,103 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 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.rm;
+
+import io.cloudbeaver.DBWConstants;
+import io.cloudbeaver.model.app.BaseWebApplication;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMProjectPermission;
+import org.jkiss.dbeaver.model.rm.RMProjectType;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.utils.CommonUtils;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class RMUtils {
+
+    public static Path getRootPath() {
+        return DBWorkbench.getPlatform().getWorkspace().getAbsolutePath();
+    }
+
+    public static Path getUserProjectsPath() {
+        return getRootPath().resolve(DBWConstants.USER_PROJECTS_FOLDER);
+    }
+
+    public static Path getSharedProjectsPath() {
+        return getRootPath().resolve(DBWConstants.SHARED_PROJECTS_FOLDER);
+    }
+
+    @NotNull
+    public static Path getProjectPath(RMProject project) {
+        switch (project.getType()) {
+            case GLOBAL:
+                return getRootPath().resolve(BaseWebApplication.getInstance().getDefaultProjectName());
+            case SHARED:
+                return getSharedProjectsPath().resolve(project.getName());
+            default:
+                return getUserProjectsPath().resolve(project.getName());
+        }
+    }
+
+    /**
+     * Different types of project have different location on the workspace. Method returns path to the project.
+     *
+     * @param projectId project name or other identifier
+     * @return path to the project based on the name of projects and prefixes that it contains
+     */
+    @NotNull
+    public static Path getProjectPathByName(@NotNull String projectId) throws DBException {
+        int divPos = projectId.indexOf("_");
+        if (divPos <= 0) {
+            throw new DBException("Bad project ID");
+        }
+
+        String prefix = projectId.substring(0, divPos);
+        String projectName = projectId.substring(divPos + 1);
+        switch (RMProjectType.getByPrefix(prefix)) {
+            case GLOBAL:
+                String defaultProjectName = BaseWebApplication.getInstance().getDefaultProjectName();
+                if (CommonUtils.isEmpty(defaultProjectName)) {
+                    throw new DBException("Global projects are not supported");
+                }
+                return getRootPath().resolve(defaultProjectName);
+            case SHARED:
+                return getSharedProjectsPath().resolve(projectName);
+            default:
+                return getUserProjectsPath().resolve(projectName);
+        }
+    }
+
+    public static Set<String> parseProjectPermissions(Set<String> permissions) {
+        return permissions.stream()
+            .map(RMProjectPermission::fromPermission).filter(Objects::nonNull)
+            .flatMap(permission -> permission.getAllPermissions().stream())
+            .collect(Collectors.toSet());
+    }
+
+    public static RMProject createAnonymousProject() {
+        RMProject project = new RMProject("anonymous");
+        project.setId("anonymous");
+        project.setType(RMProjectType.USER);
+        project.setProjectPermissions(RMProjectPermission.DATA_SOURCES_EDIT.getAllPermissions().toArray(new String[0]));
+        return project;
+    }
+}