Cb 5819 administration tables redesign (#3033)

* CB-5819 add user panel

* CB-5819 redesign teams

* CB-5819 remove extra styles

* CB-5819 review fixes

* CB-5819 revert group title

* CB-5819 remove code duplication

* CB-5819 fix import

* CB-5819 move user table loader

* CB-5819 keep loader mounted

* CB-5819 truncate titles

---------

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>

.github/workflows/backend-build.yml

@@ -0,0 +1,42 @@
+name: Backend Build
+
+on:
+  # Allows you to reuse workflows by referencing their YAML files
+  workflow_call:
+
+jobs:
+  build-backend:
+    name: Build
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: cloudbeaver
+
+      - name: Clone Deps Repositories
+        uses: dbeaver/github-actions/clone-repositories@devel
+        with:
+          project_deps_path: "./cloudbeaver/project.deps"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+          cache: maven
+
+      - uses: dbeaver/github-actions/install-maven@devel
+
+      - name: Run build script
+        run: ./build-backend.sh
+        shell: bash
+        working-directory: ./cloudbeaver/deploy
+
+      # - name: Archive build artifacts
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: backend-build-artifacts
+      #     path: cloudbeaver/deploy/cloudbeaver
+      #     if-no-files-found: error

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

@@ -1,10 +0,0 @@
-name: "Commit Message Validation"
-
-on:
-  pull_request:
-    branches:
-      - devel
-
-jobs:
-  validate-commit-message:
-    uses: dbeaver/dbeaver/.github/workflows/reused-commit-msgs-validator.yml@devel

.github/workflows/common-cleanup.yml

@@ -0,0 +1,14 @@
+name: Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+  push:
+    branches:
+      - devel
+
+jobs:
+  delete-caches:
+    name: Cleanup
+    uses: dbeaver/dbeaver-common/.github/workflows/cleanup-caches.yml@devel
+    secrets: inherit

.github/workflows/docker-build-and-push.yml

@@ -0,0 +1,93 @@
+name: Build and Push Docker Image
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  # Allows you to reuse workflows by referencing their YAML files
+  workflow_call:
+
+jobs:
+  build-and-push-docker:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download backend artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-build-artifacts
+          path: deploy/cloudbeaver/
+
+      - name: Download frontend artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-build-artifacts
+          path: deploy/cloudbeaver/web
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Run custom Docker build script
+        run: ./make-docker-container.sh
+        shell: bash
+        working-directory: ./deploy/docker
+
+      - name: Tag Docker Image
+        run: |
+          REPO_NAME=$(basename ${{ github.repository }})
+          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/$REPO_NAME
+          BRANCH_NAME=${{ github.head_ref || github.ref_name }}
+          TAG_NAME=$(echo $BRANCH_NAME | sed 's/[^a-zA-Z0-9._-]/-/g')
+          docker tag dbeaver/cloudbeaver:dev $IMAGE_NAME:$TAG_NAME
+          echo "image=$IMAGE_NAME:$TAG_NAME" >> $GITHUB_ENV
+
+      # - name: Install Docker Credential Helper
+      #   run: |
+      #     sudo apt-get update
+      #     sudo apt-get install -y gnupg2 pass
+      #     curl -fsSL https://github.com/docker/docker-credential-helpers/releases/download/v0.6.4/docker-credential-pass-v0.6.4-amd64.tar.gz -o docker-credential-pass.tar.gz
+      #     tar xzvf docker-credential-pass.tar.gz
+      #     sudo mv docker-credential-pass /usr/local/bin/docker-credential-pass
+      #     sudo chmod +x /usr/local/bin/docker-credential-pass
+  
+      # - name: Configure Docker to use Credential Helper
+      #   run: |
+      #     mkdir -p ~/.docker
+      #     echo '{"credsStore":"pass"}' > ~/.docker/config.json
+
+      # - name: Initialize Password Store
+      #   run: |
+      #     gpg --batch --gen-key <<EOF
+      #     %no-protection
+      #     Key-Type: default
+      #     Subkey-Type: default
+      #     Name-Real: Docker Credential Helper
+      #     Expire-Date: 0
+      #     %commit
+      #     EOF
+      #     pass init "$(gpg --list-keys --with-colons | grep '^pub' | cut -d: -f5)"
+
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+
+      - name: Push Docker Image
+        run: docker push ${{ env.image }}
+
+      # - name: Comment on Pull Request
+      #   if: github.event_name == 'pull_request'
+      #   uses: actions/github-script@v6
+      #   with:
+      #     github-token: ${{ secrets.PAT }}
+      #     script: |
+      #       const tag = process.env.TAG_NAME;
+      #       const commentBody = `The Docker image has been built and pushed to Docker Hub.\n\nYou can pull the image using the following command:\n\`\`\`\ndocker pull dbeaver/cloudbeaver:${tag}\n\`\`\``;
+      #       github.rest.issues.createComment({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #         issue_number: context.issue.number,
+      #         body: commentBody
+      #       });

.github/workflows/frontend-build.yml

@@ -0,0 +1,76 @@
+name: Frontend Build
+
+on:
+  # Allows you to reuse workflows by referencing their YAML files
+  workflow_call:
+    outputs:
+      build-status:
+        description: "Build status"
+        value: ${{ jobs.frontend-build.outputs.build-status }}
+      test-status:
+        description: "Test status"
+        value: ${{ jobs.frontend-build.outputs.test-status }}
+    inputs:
+      skip_cache:
+        required: false
+        type: string
+
+jobs:
+  frontend-build:
+    name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: read
+
+    outputs:
+      build-status: ${{ steps.build.outcome }}
+      test-status: ${{ steps.test.outcome }}
+
+    defaults:
+      run:
+        working-directory: ./webapp
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: yarn
+          cache-dependency-path: webapp/yarn.lock
+
+      - name: restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-
+
+      - name: restore typescript cache
+        uses: actions/cache@v4
+        with:
+          path: "**/packages/*/dist"
+          key: ${{ runner.os }}-dist-${{ hashFiles('webapp/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-dist-
+
+      - name: yarn clean
+        if: env.skip_cache == 'true'
+        run: yarn clear
+
+      - run: yarn install --immutable
+
+      - run: yarn bundle
+        working-directory: ./webapp/packages/product-default
+
+      - run: yarn test
+
+      # - name: Archive build artifacts
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: frontend-build-artifacts
+      #     path: webapp/packages/product-default/lib
+      #     if-no-files-found: error

.github/workflows/frontend-lint.yml

@@ -0,0 +1,45 @@
+name: Frontend Lint
+
+on:
+  # Allows you to reuse workflows by referencing their YAML files
+  workflow_call:
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      contents: read
+
+    defaults:
+      run:
+        working-directory: ./webapp
+        
+    steps:
+      - uses: actions/checkout@v4
+
+      - run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: yarn
+          cache-dependency-path: webapp/yarn.lock
+
+      - name: restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-
+
+      - run: |
+          yarn install --immutable
+          git fetch origin "${{ github.base_ref }}" --depth=1
+          FILES=$(git diff --name-only 'origin/${{ github.base_ref }}' ${{ github.sha }} -- . | sed 's|^webapp/||')
+          if [ -n "$FILES" ]; then
+            yarn lint --pass-on-no-patterns --no-error-on-unmatched-pattern $FILES
+          else
+            echo "No files to lint"
+          fi

.github/workflows/push-pr-devel.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  push:
+    branches: [devel]
+
+concurrency:
+  group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || 'push-pr-devel' }}
+  cancel-in-progress: true
+
+jobs:
+  build-server:
+    name: Server
+    uses: ./.github/workflows/backend-build.yml
+    secrets: inherit
+
+  build-frontend:
+    name: Frontend
+    uses: ./.github/workflows/frontend-build.yml
+    secrets: inherit
+
+  lint-server:
+    name: Server
+    uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
+    secrets: inherit
+
+  lint-frontend:
+    name: Frontend
+    uses: ./.github/workflows/frontend-lint.yml
+    secrets: inherit
+
+  # call-frontend-tests:
+  #   name: Frontend Unit Tests
+  #   needs: call-frontend-build
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Check if tests passed
+  #       if: ${{ needs.call-frontend-build.outputs.test-status != 'success' }}
+  #       run: |
+  #         echo "Tests failed"
+  #         exit 1
+  #     - name: Continue if tests passed
+  #       if: ${{ needs.call-frontend-build.outputs.test-status == 'success' }}
+  #       run: echo "Tests passed"
+
+  # call-docker-build-and-push:
+  #   name: Run
+  #   needs: [call-backend-build, call-frontend-build]
+  #   uses: ./.github/workflows/docker-build-and-push.yml

.gitignore

@@ -16,9 +16,6 @@
 *.ear
 *.rar
 
-# editor files
-.vscode
-
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
@@ -29,7 +26,13 @@ dist/
 
 *.iml
 /idea/
-.idea/
+
+
+## Mac OS
+.DS_Store
+
+## tests
+server/test/io.cloudbeaver.test.platform/workspace/.data/
 
 ## Eclipse configs
 
@@ -37,5 +40,10 @@ dist/
 .classpath
 .settings/
 
+## Eclipse PDE
+*.product.launch
+
+workspace-dev-ce/
 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.vscodeintellicode",
+    "yzhang.markdown-all-in-one",
+    "GraphQL.vscode-graphql-syntax",
+    "mrmlnc.vscode-json5",
+    "esbenp.prettier-vscode"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,76 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "request": "launch",
+      "name": "CloudBeaver CE",
+      "url": "http://localhost:8080",
+      "webRoot": "${workspaceFolder}/..",
+      "outFiles": [
+        "${workspaceFolder}/../cloudbeaver/packages/**/dist/**/*.{js,jsx}"
+      ],
+      "smartStep": true,
+      "sourceMaps": true,
+      "disableNetworkCache": true,
+      "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
+    },
+    {
+      "type": "java",
+      "name": "CloudBeaver CE Server",
+      "cwd": "${workspaceFolder}/../opt/cbce",
+      "request": "launch",
+      "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
+      "args": [
+        "-product",
+        "io.cloudbeaver.product.ce.product",
+        "-configuration",
+        "file:${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product/",
+        "-dev",
+        "file:${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product/dev.properties",
+        "-nl",
+        "en",
+        "-web-config",
+        "conf/cloudbeaver.conf",
+        "-registryMultiLanguage"
+      ],
+      // "windows": {
+      //   "args": ["-os", "win32", "-ws", "win32", "-arch", "x86_64"]
+      // },
+      // "osx": {
+      //   "args": ["-os", "macosx", "-ws", "cocoa", "-arch", "aarch64"]
+      // },
+
+      "vmArgs": [
+        "-XX:+IgnoreUnrecognizedVMOptions",
+        "-Xms64m",
+        "-Xmx1024m",
+        "-Declipse.pde.launch=true",
+        "-XstartOnFirstThread",
+        "-Dfile.encoding=UTF-8",
+        "--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/jdk.internal.misc=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",
+        "--add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED",
+        "--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED",
+        "--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED",
+        "--add-opens=java.sql/java.sql=ALL-UNNAMED"
+      ]
+    }
+  ]
+}

.vscode/license.code-snippets

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

.vscode/settings.json

@@ -0,0 +1,51 @@
+{
+  "editor.tabSize": 2,
+  "editor.formatOnSave": true,
+  "editor.linkedEditing": 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.useAliasesForRenames": false,
+  "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.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-common/.github/dbeaver-checkstyle-config.xml",
+  "java.checkstyle.version": "10.12.0"
+}

.vscode/tasks.json

@@ -0,0 +1,121 @@
+{
+  "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": "Run Tests CE",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["test"]
+    },
+    {
+      "label": "Run DevServer CE",
+      "group": "build",
+      "isBackground": true,
+      "type": "shell",
+      "command": "yarn",
+      "args": ["dev"],
+      "options": {
+        "env": {
+          "server": "${input:stage.ce}"
+        },
+        "cwd": "${workspaceFolder}/webapp/packages/product-default"
+      }
+    },
+    {
+      "label": "Generate Eclipse PDE CloudBeaver",
+      "type": "shell",
+      "osx": {
+        "command": "./generate_workspace.sh"
+      },
+      "windows": {
+        "command": "./generate_workspace.cmd"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/../cloudbeaver"
+      },
+      "presentation": {
+        "reveal": "silent",
+        "close": true,
+        "clear": false
+      }
+    },
+    {
+      "label": "Build CE",
+      "type": "shell",
+      "windows": {
+        "command": "./build.bat"
+      },
+      "osx": {
+        "command": "./build.sh"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/deploy"
+      },
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "Run Backend CE",
+      "type": "shell",
+      "windows": {
+        "command": "./run-server.bat"
+      },
+      "osx": {
+        "command": "./run-server.sh"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
+      }
+    },
+    {
+      "label": "Yarn Install",
+      "type": "shell",
+      "command": "yarn install",
+      "args": [],
+      "presentation": {
+        "reveal": "silent",
+        "close": true,
+        "clear": false
+      }
+    },
+    {
+      "label": "Update TS references CE",
+      "type": "shell",
+      "command": "yarn run update-ts-references",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp"
+      }
+    },
+    {
+      "label": "Clean CE",
+      "type": "shell",
+      "command": "yarn clean",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp"
+      }
+    }
+  ],
+  "inputs": [
+    {
+      "type": "pickString",
+      "id": "stage.ce",
+      "description": "CE Stage servers",
+      "default": "http://localhost:8978/",
+      "options": ["http://localhost:8978/"]
+    }
+  ]
+}

README.md

@@ -1,13 +1,16 @@
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" align="right" width="250"/>
+
 # CloudBeaver Community
 
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" width="250"/>
-
 Cloud Database Manager - Community Edition.  
-CloudBeaver is a web server which provides rich web interface. Server itself is a Java application, web part is written on TypeScript and React.  
+CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
-See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.  
+See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 
 
-![](https://github.com/dbeaver/cloudbeaver/wiki/images/demo_screenshot_1.png)
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
 
 ## Run in Docker
 
@@ -16,312 +19,65 @@ See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 
 ## Demo server
 
-You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io  
+You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
 
 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)
 
 ## Changelog
 
-### CloudBeaver 21.3.0 - 2021-12-24
+### 24.2.3. 2024-10-21
+- Important update:
+  -    Connections Templates feature is declared as obsolete and will be removed in future releases.
+- General:
+  -    Data editor enhancements: Rows with focused cells are specially marked to make it easier to locate a position in large tables;
+  -    DB2i driver has been updated to version 20.0.7;
+  -    The URL mode for PostgreSQL now supports connecting to multiple databases;
+  -    The issue with displaying BLOB data types in DuckDB has been resolved.
 
-Changes since 21.2.0
+### 24.2.2. 2024-10-07
+- Schemas were added to the SQL autocompletion for PostgreSQL, H2, and SQL Server;
+- CloudBeaver can now correctly display negative dates for MySQL database;
+- A search option was added for preferences in the Administration part;
+- Keyboard navigation has been enhanced. You can now use the arrow keys to move through navigator tree elements and the tab key to switch between editors tabs;
+- Sample SQLite database was removed.
+
+### 24.2.1. 2024-09-23
+- Chinese localization has been improved (thanks to [cashlifei](https://github.com/cashlifei));
+- Environment variables configuration has been improved - now you can configure more variables on the initial stage of the Docker setup;
+- SQL Server driver has been updated to version 12.8.0.
+
+### 24.2.0. 2024-09-02
+### Changes since 24.1.0:
+- General:
+  -    French language support was added (thanks to [matthieukhl](https://github.com/matthieukhl))
+  -    Added the ability to close editor tabs with the middle mouse button
+  -    Added right-click support to open the context menu in the Metadata Editor
+  -    The list of forbidden characters for naming and renaming resource manager files has been updated, and now it includes the following characters: / : " \ ' <> | ? *
+  -    Application cookies security was improved
+- Authentication:
+  -    Improved LDAP authentication: added the ability to filter users via service account parameters and ability to specify custom unique user identifiers
 - Data Editor:
-  - Table rows can be duplicated.
-  - Hotkeys are added for table editing.
-  - Confirmation is required to close or refresh a table with unsaved changes.
-  - XML values can be edited.
+  -    Added additional notifications about the restricted operations
+  -    Enhanced IPv6 and DateTime32 data representation for Clickhouse
+  -    Data editing was fixed for DuckDB
 - SQL Editor:
-  - SQL formatting is available.
-  - Scripts can be downloaded and uploaded.
-  - The SQL Editor can be opened in a separate browser tab.
-- Metadata Editor:
-  - Objects DDL can be saved to an external file.
+  -    SQL Editor auto-completion was enhanced to get column, table, and function names faster
+  -    Fixed the dollar-quoted string parsing in the SQL Editor for PostgreSQL
+  -    Improved display of the long error messages in the SQL Editor and Log viewer
+  -    Changed the save script icon to a floppy disk for better recognition
+  -    Improved application behavior when closing a connection - open editors won't be closed on disconnect
 - Administration:
-  - Instructions to update the CloudBeaver version are available for administrators.
-  - The server easy configuration is simplified.
-  - Deleting of roles with assigned users is prohibited.
-- Local configuration:
-  - The following limits can be set:
-    - the size of exported files,
-    - the number of fetched table rows,
-    - the number of executable queries at the same time.
-  - The possibility to edit database objects can be disabled.
-  - User access information can be stored in a local database.
-- The current user information is available in the Profile at the top menu.
-- Chinese UI localization is supported. 
-- DB2 iSeries driver is added.
-- A lot of small bug fixes, enhancements and improvements have been made.
+  -    Redesigned administration navigation panel - now it is more compact and clear
+  -    Added the ability to change the default commit mode for each connection separately
+  -    Added the ability to configure the server property rootURI parameter (thanks to [arioko](https://github.com/arioko))
+- Databases:
+  -    Added the "Keep alive" setting for Db2 LUW and IMB i, Apache Kyuubi, Clickhouse, Firebird, and Trino
+  -    Updated Firebird driver to version 5.0.4
+  -    DDL generation for Oracle Tablespaces was added (thanks to [pandya09](https://github.com/pandya09))
 
-### CloudBeaver 21.2.4 - 2021-12-09
-- SQL formatting is available in the SQL Editor.
-- Confirmation is required to refresh a table with unsaved changes.
-- Following limits can be set in the configuration file:
-  - the size of exported files,
-  - the number of fetched table rows,
-  - the number of executable queries at the same time.
-- Different bugs have been fixed.
+## Contribution
+As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
 
-### CloudBeaver 21.2.3 - 2021-11-24
-- Objects DDL can be saved to an external file from the Metadata Editor.
-- The SQL Editor can be opened in a separate browser tab.
-- The possibility to edit database objects can be disabled in the configuration file.
-- DB2 iSeries driver has been added.
-- Different bug fixes and improvements have been made.
-
-### CloudBeaver 21.2.2 - 2021-11-11
-- Scripts can be downloaded and uploaded in the SQL Editor.
-- The current user information is available in the Profile at the top menu.
-- Page refresh doesn't affect the navigator tree view.
-- Different bug fixes and improvements are made.
-
-### CloudBeaver 21.2.1 - 2021-10-29
-- Deleting of roles with assigned users has been prohibited.
-- “Select all” checkboxes have been added to simplify access management.
-- The SQL Editor highlighting has been improved.
-- Different bugs have been fixed.
-
-### CloudBeaver 21.2.0 - 2021-10-14
-
-Changes since 21.1.0
-- The Metadata Editor and the Navigator tree:
-  - Objects can be deleted and renamed.
-  - SQL Scripts generation is available in the objects’ context menu.
-
-- The SQL Editor:
-  - Option to run SQL Scripts is implemented.
-  - Auto-complete is improved.
-
-- The Administration part:
-  - Role management is added. 
-
-- The Data Editor:
-  - Possibility to add and delete rows was added.
-  - The SQL script preview is available after making changes and before saving or discarding them.
-  - Radio buttons are added to the Value panel to edit Boolean values.
-
-- The Connection form:
-  - The database and SSH credentials can be entered to test connections.
-
-- Session expiration notifications were improved.
-- Possibility to skip the Easy configuration step according to the configuration was added.
-- A lot of small bug fixes, enhancements and improvements are made.
-
-### CloudBeaver 21.1.5 - 2021-09-30
-- Objects can be deleted and renamed via UI.
-- SQL Scripts generation is available in the objects’ context menu.
-- Connected and disconnected databases are divided into 2 groups in the SQL Editor.
-- Other UI improvements have been made.
-
-### CloudBeaver 21.1.4 - 2021-09-09
-- Role management is added. 
-- Context menu is available in the Metadata Editor.
-- Different UI bugs have been fixed.
-
-### CloudBeaver 21.1.3 - 2021-08-30
-- Table rows can be created and deleted from the Data Editor.
-- It is possible to preview scripts in the Data Editor.
-- The dialog to enter the credentials appears when you test connections.
-- Different UI bugs have been fixed.
-
-### CloudBeaver 21.1.2 - 2021-08-11
-- Option to run SQL Scripts is implemented.
-- Radio buttons are added to the Value panel to edit Boolean values.
-- Minor UI fixes and improvements are made.
-
-### CloudBeaver 21.1.1 - 2021-08-02
-- The new notification way prevents users from working after session expiration.
-- The option to skip the Easy configuration step can be configured.
-- Minor UI fixes and improvements are made.
-
-### CloudBeaver 21.1.0 - 2021-07-15
-
-Changes since 21.0.0
-- Navigation tree:
-  - User's and shared connections are divided into different groups.
-- Connection form:
-  - Read-only connections are marked in the connection form.
-  - It is possible to show and hide password in the connection dialog.
-- Data editor:
-  - New actions are available from the context menu:
-    - filtering
-    - ordering
-    - cell editing.
-  - Support for different formats is added to the Value panel.
-  - Work with links is improved:
-    - Links to the web pages can be opened from the tables
-    - Links to the pictures are automatically transformed to the pictures on the Value panel.
-  - It is possible to edit Boolean values as checkboxes in the tables.
-  - Read-only columns and tables are marked in the result set.
-- SQL editor:
-  - Query execution plan is added.
-  - Database logos are displayed in the top menu selector.
-  - Auto-complete for the SQL dialects works automatically.
-- Log viewer:
-  - Detailed information for errors is opened on the panel.
-- Administration part:
-  - Access management for users and connections is improved.
-- It is possible to change the user password from the public part of CloudBeaver.
-- New design for dialogs is implemented.
-- Possibility to export data for users can be configured.
-- A lot of UI fixes, enhancements and improvements are made.
-
-### CloudBeaver 21.0.5 - 2021-06-30
-- Query execution plan was added.
-- Option to show/hide password in the connection dialog was added.
-- Minor UI fixes and improvements.
-
-### CloudBeaver 21.0.3 - 2021-06-11
-
-- Filtering and Ordering from the context menu were added for the data editor .
-- Read-only columns and result sets were marked in the data editor. 
-- Possibility to remove data export feature from UI was added.
-- CloudBeaver docker image is based on Ubuntu Slim now.
-- Minor UI fixes and improvements.
-
-### CloudBeaver 21.0.2 - 2021-05-20
-
-- User's and shared connections are divided to different groups in the navigation tree.
-- New design for authentication and driver properties dialogs was applied. 
-- Management for administrators' accounts was improved.
-- Minor UI fixes and improvements.
-
-### CloudBeaver 21.0.1 - 2021-04-28
-
-- Database logos were added to the top menu selector.
-- New panel to show error details were added to Log Viewer.
-- Read-only connections were marked in the connection details form.
-- New design for dialogs was implemented. 
-- Minor UI fixes and improvements.
-
-### CloudBeaver 21.0.0 - 2021-04-15
-
-Changes since 20.0.0:
-- Navigation tree:
-  - Simple and advanced view for database objects
-  - Show system objects option
-- Connection form:
-  - New drivers: Oracle, SQL Server, Trino (Presto), Derby Server
-  - SSH support 
-  - Editing for manual connections
-  - Custom fields for advanced connection settings
-  - Connection form redesign
-  - Fixes for the name duplicates and deletion of the template connections
-- Data editor:
-  - Value panel for data review and editing
-  - Spatial data viewer
-  - Sorting indication for the data grid
-  - Performance improvements
-- SQL editor:
-  - Improvements for autosuggest and highlighting
-- Log viewer:
-  - Quick review for the error details
-  - All errors and warnings on the panel
-- New page with the product information
-- Administration part:
-  - Redesign for the authentication engine 
-  - Server re-configuration without re-login
-  - Additional labels for the connections with SSH
-- A lot of UI fixes, enhancements and improvements.
-
-### CloudBeaver 20.0.6 - 2021-03-31
-
-- Value panel for Data Viewer was added: a full text of your cell value on a special panel to view and edit.
-- Spatial data support was added: single and multi objects can be shown on a map.
-- Possibility to Show or Hide system objects was added to the context menu in the Navigator.
-- All product information can be found in public settings.
-- A lot of minor UI fixes and improvements.
-
-### CloudBeaver 20.0.5 - 2021-03-18
-
-- New design for the connection form
-- Possibility to edit connections created manually in the public part of the application
-- SSH support for connections in public part of the application
-- Possibility to deny credentials saving
-- Drivers for MS SQL Server, Oracle, DB2 LUW, Derby, Trino (Presto SQL) 
-- Performance improvements for data grid
-- A lot of minor UI fixes and improvements
-
-### CloudBeaver 20.0.3 - 2021-02-10
-
-- New drivers are included in CloudBeaver CE: Oracle, MS SQL Server, DB2 LUW, Derby, Trino (Presto SQL) 
-- Simple view for the Navigation Tree is added
-- Custom properties fields are added in the Connection dialog
-- SSH support is added
-- Shortcuts for Mac are improved
-- Possibility to cancel data loading is available in data editor
-- SQL Editor autosuggest and highlighting are improved
-- A lot of minor UI fixes and improvements
-
-### CloudBeaver 20.0.1 - 2020-12-29
-
-- Notifications about the users and connections source are added to administration pages
-- Connection name can be set in the New connection dialog
-- Multiple execution context creation is fixed for SQL Editor
-- Easy access to server logs was added for administrator (/api/logs/)
-- Unsupported objects was hidden
-- Primary keys editing was fixed
-- Objects limit is added for Navigation Tree
-- SQL Editor autosuggest is improved
-- A lot of minor UI fixes and improvements
-
-### CloudBeaver 1.2.3 - 2020-11-25
-
-- New loading screen is added
-- All connections and tabs are restored after re-login
-- Active connections are highlighted in the Navigation tree
-- Administration panel is improved:
-    - Administration page is available when the general authentication is disabled (/#/admin)
-    - Authentication and manual connections is enabled by default in the easy-configuration mode
-- All notifications are redesigned
-- A lot of minor UI fixes and improvements
-
-### CloudBeaver 1.2.0 - 2020-10-19
-
-- Docker environment support was added
-- Filter panel was added in data editor
-- User authentication and roles were added
-- Administration panel was added:
-    - Server management
-    - Connection management
-    - Automatic search of databases
-    - User management
-- A lot of minor fixes and improvements
-
-### CloudBeaver 1.1.0 - 2020-07-14
-
-- Connection management and authentication redesign
-- Webpack build minimization
-- A lot of minor UI improvements
-- Many minor UI improvements
-
-### CloudBeaver 1.0.4 - 2020-06-16
-
-- Database navigator refresh
-- Data viewer: filters support
-- Many minor UI improvements
-
-### CloudBeaver 1.0.3 - 2020-06-02
-
-- Administrative panel
-- User management
-- Authentication model redesign
-- Build artifacts minimization
-- Many minor UI improvements
-
-### 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
+[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
+The most significant contribution to our code for the major release 24.2.0 was made by:
+1. [matthieukhl](https://github.com/matthieukhl)

SECURITY.md

@@ -0,0 +1,18 @@
+# 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 |
+| ------- | --------- |
+| 22.x    | yes       |
+| 23.x    | yes       |
+| 24.x    | 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>2.1.214</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

@@ -0,0 +1,33 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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);
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,76 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+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-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+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-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+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/GlobalConfiguration/.dbeaver/data-sources.json

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

config/core/cloudbeaver.conf

@@ -0,0 +1,104 @@
+{
+    server: {
+        serverPort: "${CLOUDBEAVER_SERVICE_PORT:8978}",
+
+        workspaceLocation: "${CLOUDBEAVER_WORKSPACE_LOCATION:workspace}",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
+
+        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
+        serviceURI: "/api/",
+
+        productSettings: {
+            # Global properties
+            core.theming.theme: 'light',
+            core.localization.localization: 'en',
+            plugin.sql-editor.autoSave: true,
+            plugin.sql-editor.disabled: false,
+            # max size of the file that can be uploaded to the editor (in kilobytes)
+            plugin.sql-editor.maxFileSize: 10240,
+            plugin.log-viewer.disabled: false,
+            plugin.log-viewer.logBatchSize: 1000,
+            plugin.log-viewer.maxLogRecords: 2000,
+            sql.proposals.insert.table.alias: PLAIN
+        },
+
+        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
+
+        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",
+
+        enableSecurityManager: false,
+
+        sm: {
+            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
+            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
+            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
+            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
+            passwordPolicy: {
+                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
+                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
+                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
+                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
+            }
+        },
+
+        database: {
+            driver: "${CLOUDBEAVER_DB_DRIVER:h2_embedded_v2}",
+            url: "${CLOUDBEAVER_DB_URL:jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
+            schema: "${CLOUDBEAVER_DB_SCHEMA:''}",
+            user: "${CLOUDBEAVER_DB_USER:''}",
+            password: "${CLOUDBEAVER_DB_PASSWORD:''}",
+            initialDataConfiguration: "${CLOUDBEAVER_DB_INITIAL_DATA:conf/initial-data.conf}",
+            pool: {
+                minIdleConnections: "${CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS:4}",
+                maxIdleConnections: "${CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS:10}",
+                maxConnections: "${CLOUDBEAVER_DB_MAX_CONNECTIONS:100}",
+                validationQuery: "${CLOUDBEAVER_DB_VALIDATION_QUERY:SELECT 1}"
+            },
+            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: "${CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED:true}",
+        anonymousUserRole: user,
+        defaultUserTeam: "${CLOUDBEAVER_APP_DEFAULT_USER_TEAM:user}",
+        grantConnectionsAccessToAnonymousTeam: "${CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM:false}",
+        supportsCustomConnections: "${CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS:false}",
+        showReadOnlyConnectionInfo: "${CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO:false}",
+        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
+
+        forwardProxy: "${CLOUDBEAVER_APP_FORWARD_PROXY:false}",
+
+        publicCredentialsSaveEnabled: "${CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED:true}",
+        adminCredentialsSaveEnabled: "${CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED:true}",
+
+        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",
+
+        resourceQuotas: {
+            dataExportFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_DATA_EXPORT_FILE_SIZE_LIMIT:10000000}",
+            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
+            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
+            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
+            sqlTextPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH:4096}",
+            sqlBinaryPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH:261120}"
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledDrivers: [
+            "sqlite:sqlite_jdbc",
+            "h2:h2_embedded",
+            "h2:h2_embedded_v2",
+            "clickhouse:yandex_clickhouse"
+        ],
+        disabledBetaFeatures: [
+
+        ]
+
+    }
+
+}

config/core/initial-data.conf

@@ -0,0 +1,16 @@
+{
+    teams: [
+        {
+            subjectId: "admin",
+            teamName: "Admin",
+            description: "Administrative access. Has all permissions.",
+            permissions: [ "admin" ]
+        },
+        {
+            subjectId: "user",
+            teamName: "User",
+            description: "All users, including anonymous.",
+            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>

deploy/build-backend.sh

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

deploy/build-frontend.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+echo "Build static content"
+
+mkdir ./cloudbeaver/web
+
+cd ../../cloudbeaver/webapp
+
+yarn
+cd ./packages/product-default
+yarn run bundle
+
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Application build failed'; exit $rc
+fi
+
+cd ../../
+yarn test
+
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Frontend tests failed'; exit $rc
+fi
+
+cd ../deploy
+
+echo "Copy static content"
+
+cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
+
+echo "Cloudbeaver is ready. Run run-server.sh in cloudbeaver folder to start the server."

deploy/build.bat

@@ -1,4 +1,7 @@
 @echo off
+
+rem command line arguments
+
 echo Clone and build Cloudbeaver
 
 IF EXIST drivers rmdir /S /Q drivers
@@ -9,16 +12,20 @@ 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
+IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.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,26 +34,42 @@ 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
+
+
+copy ..\config\core\* cloudbeaver\conf >NUL
+copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
+
 move drivers cloudbeaver >NUL
 
-echo Build static content
+echo "Build static content"
+
+mkdir .\cloudbeaver\web
 
 cd ..\webapp
 
 call yarn
-call lerna bootstrap
-call lerna run build --no-bail --stream --scope=@cloudbeaver/product-default &::-- -- --env source-map
+cd .\packages\product-default
+call yarn run bundle
+
+if %ERRORLEVEL% neq 0 (
+    echo 'Application build failed'
+    exit /b %ERRORLEVEL%
+)
+
+cd ..\..\
+call yarn test
+
+if %ERRORLEVEL% neq 0 (
+    echo 'Frontend tests failed'
+    exit /b %ERRORLEVEL%
+)
 
 cd ..\deploy
 
-echo Copy static content
+echo "Copy static content"
 
 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL
 
-echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
+echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
 
 pause

deploy/build.sh

@@ -1,57 +1,5 @@
 #!/bin/bash
-set -e
+set -Eeuo pipefail
 
-echo "Clone and build Cloudbeaver"
-
-rm -rf ./drivers
-rm -rf ./cloudbeaver
-mkdir ./cloudbeaver
-mkdir ./cloudbeaver/server
-mkdir ./cloudbeaver/conf
-mkdir ./cloudbeaver/workspace
-mkdir ./cloudbeaver/web
-
-echo "Clone dbeaver platform"
-
-cd ../..
-[ ! -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
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Could not perform package'; exit $rc
-fi
-cd ../../../deploy
-
-echo "Copy server packages"
-
-cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
-cp -p ./scripts/* ./cloudbeaver
-mkdir cloudbeaver/samples
-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/
-mv drivers cloudbeaver
-
-echo "Build static content"
-
-cd ../webapp
-
-yarn
-lerna run bootstrap
-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
-
-echo "Copy static content"
-
-cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
-
-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+source build-backend.sh 
+source build-frontend.sh

deploy/docker/Dockerfile

@@ -1,8 +0,0 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.12_7-ubuntu-slim
-
-COPY cloudbeaver /opt/cloudbeaver
-
-EXPOSE 8978
-
-WORKDIR /opt/cloudbeaver/
-ENTRYPOINT ["./run-server.sh"]

deploy/docker/base-java/Dockerfile

@@ -0,0 +1,47 @@
+FROM ubuntu:24.04
+
+MAINTAINER DBeaver Corp, devops@dbeaver.com
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
+        curl \
+        wget \
+        # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
+        # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
+        # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
+        fontconfig \
+        # utilities for keeping Ubuntu and OpenJDK CA certificates in sync
+        # https://github.com/adoptium/containers/issues/293
+        ca-certificates p11-kit \
+        # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351
+        # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory
+        binutils \
+        tzdata \
+        # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8
+        locales \
+        nano \
+    ; \
+    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
+    locale-gen en_US.UTF-8; \
+    rm -rf /var/lib/apt/lists/*
+
+ENV LANG=en_US.UTF-8
+
+ENV JAVA_HOME=/opt/java/openjdk
+COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+RUN set -eux; \
+    # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
+    find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
+    ldconfig; \
+    # https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
+    # https://openjdk.java.net/jeps/341
+    java -Xshare:dump;
+
+### Patch java security
+COPY java.security* ${JAVA_HOME}/conf/security/java.security

deploy/docker/cloudbeaver-ce/Dockerfile

@@ -0,0 +1,13 @@
+FROM dbeaver/base-java
+
+MAINTAINER DBeaver Corp, devops@dbeaver.com
+
+RUN apt-get update; \
+    apt-get upgrade -y; 
+    
+COPY cloudbeaver /opt/cloudbeaver
+
+EXPOSE 8978
+RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
+WORKDIR /opt/cloudbeaver/
+ENTRYPOINT ["./run-server.sh"]

deploy/docker/make-docker-container.sh

@@ -1,3 +1,3 @@
 cd ..
-docker build -t dbeaver/cloudbeaver:dev . --file ./docker/Dockerfile
+docker build -t dbeaver/cloudbeaver:dev . --file ./docker/cloudbeaver-ce/Dockerfile
 

deploy/scripts/run-server.bat

@@ -1,11 +1,47 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 
 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 %JAVA_OPTS% -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage
+SET VMARGS_OPTS = ""
+If Not Defined JAVA_OPTS (
+    SET VMARGS_OPTS = "-Xmx2048M"
+)
+
+java %JAVA_OPTS% ^
+    -Dfile.encoding=UTF-8 ^
+    --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/jdk.internal.misc=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 ^
+    --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED ^
+    --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED ^
+    --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED ^
+    --add-opens=java.sql/java.sql=ALL-UNNAMED ^
+    -jar  %launcherJar% ^
+    -product io.cloudbeaver.product.ce.product ^
+    -data %workspacePath% ^
+    -web-config conf/cloudbeaver.conf ^
+    -nl en ^
+    -registryMultiLanguage

deploy/scripts/run-server.sh

@@ -1,9 +1,40 @@
 #!/bin/bash
 
-launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
+launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
-[ ! -d "workspace/.metadata" ] && mkdir -p 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 ${JAVA_OPTS} -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage
+exec java ${JAVA_OPTS} \
+  -Dfile.encoding=UTF-8 \
+  --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/jdk.internal.misc=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 \
+  --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED \
+  --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
+  --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
+  --add-opens=java.sql/java.sql=ALL-UNNAMED \
+  -jar ${launcherJar} \
+  -product io.cloudbeaver.product.ce.product \
+  -web-config conf/cloudbeaver.conf \
+  -nl en \
+  -registryMultiLanguage

deploy/supervisor/cloudbeaver.conf

@@ -1,10 +0,0 @@
-[program:cloudbeaver]
-directory=/opt/cloudbeaver/
-command=/opt/cloudbeaver/run-server.sh
-stopasgroup=true
-killasgroup=true
-stopsignal=INT
-autostart=true
-autorestart=true
-redirect_stderr=true
-stdout_logfile=/var/log/cloudbeaver-server.log

generate_workspace.cmd

@@ -0,0 +1,3 @@
+SET mypath=%~dp0
+
+.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%

generate_workspace.sh

@@ -0,0 +1 @@
+./../idea-rcp-launch-config-generator/runGenerator.sh -f "$PWD"

javaConfig.json

@@ -0,0 +1,3 @@
+{
+  "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.cloudbeaver.tp">
+	<locations>
+		<location path="../dbeaver-workspace/dependencies/plugins" type="Directory"/>
+	</locations>
+</target>

osgi-app.properties

@@ -0,0 +1,33 @@
+workspaceName=cloudbeaver-ce
+featuresPaths=\
+  dbeaver/features;\
+  cloudbeaver/server/features;
+bundlesPaths=\
+  dbeaver-common/modules;\
+  dbeaver/plugins;\
+  cloudbeaver/server/bundles;
+testLibraries=\
+  org.junit;\
+  org.mockito.mockito-core;\
+  junit-jupiter-api;\
+  org.opentest4j
+repositories=\
+  https://p2.dev.dbeaver.com/eclipse-repo/;\
+  https://download.eclipse.org/releases/${eclipse-version}/;
+testBundles=\
+  org.junit;\
+  org.mockito.mockito-core;\
+  junit-jupiter-api;\
+  org.opentest4j
+productsPaths=\
+  dbeaver/product/community/DBeaver.product;\
+  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;
+ideaConfigurationFilesPaths=\
+  dbeaver/.ide/.idea;
+testBundlePaths=\
+  dbeaver/test;\
+  cloudbeaver/server/test;
+additionalModuleRoots=\
+  opt;
+optionalFeatureRepositories=\
+  dbeaver/product/repositories

project.deps

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

samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json

@@ -1,39 +0,0 @@
-{
-	"folders": {},
-	"connections": {
-		"sqlite_xerial-sample-database": {
-			"provider": "generic",
-			"driver": "sqlite_jdbc",
-			"name": "SQLite - Chinook (Sample)",
-			"save-password": true,
-			"navigator-show-only-entities": false,
-			"navigator-hide-folders": false,
-			"read-only": false,
-			"template": false,
-			"configuration": {
-				"database": "${application.path}/../samples/db/Chinook.sqlitedb",
-				"type": "dev",
-				"auth-model": "native"
-			}
-		},
-		"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"
-				}
-			}
-		}
-	}
-}

samples/sample-databases/README.md

@@ -1,3 +0,0 @@
-### Sample databases
-
-Provides access to locally deployed SQLite sample database

samples/sample-databases/cloudbeaver.conf

@@ -1,64 +0,0 @@
-{
-    server: {
-        serverPort: 8978,
-
-        workspaceLocation: "workspace",
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        rootURI: "/",
-        serviceURI: "/api/",
-
-        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,
-        anonymousUserRole: "user",
-        supportsCustomConnections: false,
-
-        publicCredentialsSaveEnabled: true,
-        adminCredentialsSaveEnabled: true,
-
-        resourceQuotas: {
-            dataExportFileSizeLimit: 10000000,
-            sqlMaxRunningQueries: 3,
-            sqlResultSetRowsLimit: 100000,
-            sqlResultSetMemoryLimit: 2000000
-        }
-
-        /*
-        enabledDrivers: [
-            "postgresql:postgres-jdbc",
-            "mysql:mysql8",
-            "mysql:mariaDB",
-            "generic:sqlite_jdbc",
-            "generic:derby_server",
-            "generic:h2_embedded",
-            "jaybird:jaybird",
-        ]
-        */
-
-    }
-
-}

samples/sample-databases/db/README

@@ -1,6 +0,0 @@
-   Chinook Database - Version 1.3
-   Script: Chinook_Sqlite.sql
-   Description: Creates and populates the Chinook database.
-   DB Server: Sqlite
-   Author: Luis Rocha
-   License: http://www.codeplex.com/ChinookDatabase/license

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" ]
-        }
-    ]
-}

samples/sample-databases/product.conf

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

server/bundles/graphql.config.yml

@@ -0,0 +1,9 @@
+projects:
+  schema:
+    include: ./**/*.graphqls
+schema: "gql.ce"
+extensions:
+  endpoints:
+    Default GraphQL Endpoint:
+      url: http://localhost:8080/api/gql
+      introspect: false

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

@@ -1,20 +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.45.qualifier
-Bundle-Release-Date: 20220124
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.core.runtime,
- org.apache.commons.logging,
- 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/build.properties

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

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/pom.xml

@@ -1,16 +0,0 @@
-<?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>
-    <parent>
-        <groupId>io.cloudbeaver</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-         <relativePath>../</relativePath>
-    </parent>
-    <artifactId>io.cloudbeaver.connect.provider.sample</artifactId>
-    <version>1.0.45-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-
-</project>

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

@@ -1,83 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 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.nio.file.Files;
-import java.nio.file.Path;
-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 String getStatus() {
-        return "Valid";
-    }
-
-    @Override
-    public List<? extends DBPDataSourceContainer> loadDataSources(DBPDataSourceRegistry registry, Map<String, Object> options) throws DBException {
-        Path metadataFolder = registry.getProject().getMetadataFolder(false);
-        if (Files.exists(metadataFolder)) {
-            Path sampleConfigFile = metadataFolder.resolve(SAMPLE_CONFIG_NAME);
-            if (Files.exists(sampleConfigFile)) {
-                log.debug("Loading provided connections from [" + sampleConfigFile.toAbsolutePath() + "]");
-                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,50 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: DBeaver Corp
+Bundle-Name: Cloudbeaver Web Model
+Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
+Bundle-Version: 1.0.64.qualifier
+Bundle-Release-Date: 20241104
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+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.model.nio;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;bundle-version:="6.0.0";visibility:=reexport
+Export-Package: io.cloudbeaver,
+ io.cloudbeaver.auth,
+ io.cloudbeaver.auth.provider,
+ io.cloudbeaver.auth.provider.fa,
+ io.cloudbeaver.auth.provider.local,
+ io.cloudbeaver.auth.provisioning,
+ io.cloudbeaver.websocket,
+ io.cloudbeaver.model,
+ io.cloudbeaver.model.app,
+ io.cloudbeaver.model.config,
+ io.cloudbeaver.model.fs,
+ io.cloudbeaver.model.log,
+ io.cloudbeaver.model.rm,
+ io.cloudbeaver.model.rm.local,
+ io.cloudbeaver.model.rm.lock,
+ io.cloudbeaver.model.session,
+ io.cloudbeaver.model.user,
+ io.cloudbeaver.model.utils,
+ io.cloudbeaver.registry,
+ io.cloudbeaver.server,
+ io.cloudbeaver.service,
+ io.cloudbeaver.service.admin,
+ io.cloudbeaver.service.security,
+ io.cloudbeaver.service.sql,
+ io.cloudbeaver.test,
+ io.cloudbeaver.utils,
+ io.cloudbeaver.utils.file
+Automatic-Module-Name: io.cloudbeaver.model
+Import-Package: org.slf4j

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

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

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

@@ -0,0 +1,27 @@
+<?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>
+
+    <extension point="com.dbeaver.secretController">
+        <controller id="void-secret" class="io.cloudbeaver.model.app.VoidSecretController"
+                    label="Default secret controller" description="Default void secret controller"/>
+    </extension>
+
+</plugin>

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

@@ -0,0 +1,16 @@
+<?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>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+         <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.model</artifactId>
+    <version>1.0.64-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>

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

@@ -2,7 +2,7 @@
 <schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="io.cloudbeaver.server" id="io.cloudbeaver.feature" name="Web features"/>
+         <meta.schema plugin="io.cloudbeaver.model" id="io.cloudbeaver.feature" name="Web features"/>
       </appInfo>
       <documentation>
          Web feature

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

@@ -0,0 +1,28 @@
+<?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>
+   </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/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,147 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
+import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMControllerProvider;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.Pair;
+
+import java.nio.file.Path;
+import java.util.Collection;
+
+public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {
+
+    @NotNull
+    private final RMProject project;
+
+    @NotNull
+    private final Path path;
+    @NotNull
+    private final RMController resourceController;
+
+    public BaseWebProjectImpl(
+        @NotNull DBPWorkspace workspace,
+        @NotNull RMController resourceController,
+        @NotNull SMSessionContext sessionContext,
+        @NotNull RMProject project,
+        @NotNull Path path
+    ) {
+        super(workspace, sessionContext);
+        this.resourceController = resourceController;
+        this.path = path;
+        this.project = project;
+    }
+
+    @NotNull
+    public RMController getResourceController() {
+        return resourceController;
+    }
+
+    @NotNull
+    @Override
+    public RMProject getRMProject() {
+        return project;
+    }
+
+    @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;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return true;
+    }
+
+    @Override
+    public void ensureOpen() {
+
+    }
+
+    @Override
+    public boolean isUseSecretStorage() {
+        return false;
+    }
+
+    /**
+     * 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,47 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import org.jkiss.dbeaver.model.access.DBAPermissionRealm;
+import org.jkiss.dbeaver.model.rm.RMConstants;
+
+/**
+ * General constants
+ */
+public interface DBWConstants {
+
+    String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
+
+    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
+    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+    String PERMISSION_SECRET_MANAGER = "secret-manager";
+
+
+    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
+    String PERMISSION_EDIT_DATA = "edit-data";
+
+    String STATE_ATTR_SIGN_IN_STATE = "state.signin";
+    String WORK_DATA_FOLDER_NAME = ".work-data";
+
+    enum SignInState {
+        GLOBAL,
+        EMBEDDED
+    }
+
+    //public static final String PERMISSION_USER = "user";
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -0,0 +1,94 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+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-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@ 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.model.sql.SQLState;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -40,6 +38,7 @@ 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_SERVER_NOT_INITIALIZED = "serverNotInitialized";
     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";
@@ -67,12 +66,8 @@ public class DBWebException extends DBException implements GraphQLError {
         this.webErrorCode = errorCode;
     }
 
-    public DBWebException(Throwable cause, DBPDataSource dataSource) {
-        super(cause, dataSource);
-    }
-
-    public DBWebException(String message, Throwable cause, DBPDataSource dataSource) {
-        super(makeMessage(message, cause), cause, dataSource);
+    public DBWebException(Throwable cause) {
+        super(null, cause);
     }
 
     public String getWebErrorCode() {
@@ -109,28 +104,35 @@ 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) {
+            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();
         }
-        extensions.put("stackTrace", stString);
-        int errorCode = getErrorCode();
+        extensions.put("stackTrace", stString.trim());
+        int errorCode = SQLState.getCodeFromException(this);
         if (errorCode != ERROR_CODE_NONE) {
             extensions.put("errorCode", errorCode);
         }
         if (!CommonUtils.isEmpty(webErrorCode)) {
             extensions.put("webErrorCode", webErrorCode);
         }
-        String databaseState = getDatabaseState();
+        String databaseState = SQLState.getStateFromException(this);
         if (databaseState != null) {
             extensions.put("databaseState", databaseState);
         }
@@ -139,14 +141,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();
+        if (cause == null) {
+            if (CommonUtils.isEmpty(message)) {
+                return "Unknown internal error";
+            } else {
+                return message;
             }
-            return "Unknown internal error";
+        }
+        if (CommonUtils.isEmpty(message)) {
+            if (cause.getMessage() != null) {
+                return cause.getMessage();
+            }
+            return cause.getClass().getName();
         }
         if (CommonUtils.equalObjects(message, cause.getMessage())) {
             return message;

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

@@ -0,0 +1,31 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver;
+
+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,370 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver;
+
+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.preferences.DBPPreferenceStore;
+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;
+    }
+
+    @NotNull
+    @Override
+    public DBPProject getProject() {
+        return dataSourceRegistry.getProject();
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceContainer getDataSource(@NotNull String id) {
+        DBPDataSourceContainer dataSource = dataSourceRegistry.getDataSource(id);
+        if (dataSource == null || dataSourceFilter != null && !dataSourceFilter.filter(dataSource)) {
+            return null;
+        }
+        return dataSource;
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceContainer getDataSource(@NotNull 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(@NotNull DBPDriver driver, @NotNull DBPConnectionConfiguration connConfig) {
+        return dataSourceRegistry.createDataSource(driver, connConfig);
+    }
+
+    @NotNull
+    @Override
+    public DBPDataSourceContainer createDataSource(@NotNull 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();
+    }
+
+    @Nullable
+    @Override
+    public DBPDataSourceFolder getFolder(@NotNull String path) {
+        return dataSourceRegistry.getFolder(path);
+    }
+
+    @NotNull
+    @Override
+    public DBPDataSourceFolder addFolder(@Nullable DBPDataSourceFolder parent, @NotNull String name) {
+        return dataSourceRegistry.addFolder(parent, name);
+    }
+
+    @Override
+    public void removeFolder(@NotNull 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(@NotNull DBSObjectFilter filter) {
+        dataSourceRegistry.updateSavedFilter(filter);
+    }
+
+    @Override
+    public void removeSavedFilter(@NotNull String filterName) {
+        dataSourceRegistry.removeSavedFilter(filterName);
+    }
+
+    @Nullable
+    @Override
+    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
+        return dataSourceRegistry.getNetworkProfile(source, name);
+    }
+
+    @NotNull
+    @Override
+    public List<DBWNetworkProfile> getNetworkProfiles() {
+        return dataSourceRegistry.getNetworkProfiles();
+    }
+
+    @Override
+    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
+        dataSourceRegistry.updateNetworkProfile(profile);
+    }
+
+    @Override
+    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
+        dataSourceRegistry.removeNetworkProfile(profile);
+    }
+
+    @Nullable
+    @Override
+    public DBAAuthProfile getAuthProfile(@NotNull 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(@NotNull DBAAuthProfile profile) {
+        dataSourceRegistry.updateAuthProfile(profile);
+    }
+
+    @Override
+    public void setAuthProfiles(@NotNull Collection<DBAAuthProfile> profiles) {
+        dataSourceRegistry.setAuthProfiles(profiles);
+    }
+
+    @Override
+    public void removeAuthProfile(@NotNull 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);
+    }
+
+    @Nullable
+    @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(@NotNull 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);
+    }
+
+    @NotNull
+    @Override
+    public Set<DBPDataSourceFolder> getTemporaryFolders() {
+        return dataSourceRegistry.getTemporaryFolders();
+    }
+
+    @NotNull
+    @Override
+    public DBPPreferenceStore getPreferenceStore() {
+        return dataSourceRegistry.getPreferenceStore();
+    }
+
+    @Override
+    public boolean loadDataSources(
+        @NotNull List<DBPDataSourceConfigurationStorage> storages,
+        @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/WebHeadlessSessionProjectImpl.java

@@ -0,0 +1,38 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.session.WebHeadlessSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMUtils;
+
+public class WebHeadlessSessionProjectImpl extends WebProjectImpl {
+    public WebHeadlessSessionProjectImpl(
+        @NotNull WebHeadlessSession session,
+        @NotNull RMProject project
+    ) {
+        super(
+            session.getWorkspace(),
+            session.getUserContext().getRmController(),
+            session.getSessionContext(),
+            project,
+            session.getUserContext().getPreferenceStore(),
+            RMUtils.getProjectPath(project)
+        );
+    }
+}

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

@@ -0,0 +1,28 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import org.jkiss.dbeaver.model.DBPPage;
+import org.jkiss.dbeaver.model.data.json.JSONUtils;
+
+import java.util.Map;
+
+public class WebPage extends DBPPage {
+    public WebPage(Map<String, Object> params) {
+        super(JSONUtils.getInteger(params, "offset"), JSONUtils.getInteger(params, "limit"));
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.task.DBTTaskManager;
+import org.jkiss.dbeaver.registry.rm.DataSourceRegistryRM;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
+
+import java.nio.file.Path;
+
+public abstract class WebProjectImpl extends BaseWebProjectImpl {
+    private static final Log log = Log.getLog(WebProjectImpl.class);
+    @NotNull
+    protected final DBPPreferenceStore preferenceStore;
+
+    public WebProjectImpl(
+        @NotNull DBPWorkspace workspace,
+        @NotNull RMController resourceController,
+        @NotNull SMSessionContext sessionContext,
+        @NotNull RMProject project,
+        @NotNull DBPPreferenceStore preferenceStore,
+        @NotNull Path path
+    ) {
+        super(workspace, resourceController, sessionContext, project, path);
+        this.preferenceStore = preferenceStore;
+    }
+
+    @Nullable
+    @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(@NotNull String propName, @Nullable 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
+    public DBTTaskManager getTaskManager() {
+        throw new IllegalStateException("Task manager not supported");
+    }
+
+    @NotNull
+    @Override
+    protected DBPDataSourceRegistry createDataSourceRegistry() {
+        return new WebDataSourceRegistryProxy(
+            new DataSourceRegistryRM(this, getResourceController(), preferenceStore),
+            getDataSourceFilter()
+        );
+    }
+
+    @NotNull
+    public DataSourceFilter getDataSourceFilter() {
+        return (ds) -> true;
+    }
+
+}

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

@@ -0,0 +1,118 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPEvent;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.security.SMObjectType;
+import org.jkiss.dbeaver.model.security.user.SMObjectPermissions;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Global project.
+ * Connections there can be not accessible.
+ */
+public class WebSessionGlobalProjectImpl extends WebSessionProjectImpl {
+    private static final Log log = Log.getLog(WebSessionGlobalProjectImpl.class);
+    private Set<String> accessibleConnectionIds = Collections.emptySet();
+
+    public WebSessionGlobalProjectImpl(@NotNull WebSession webSession, @NotNull RMProject project) {
+        super(webSession, project);
+    }
+
+    /**
+     * Update info about accessible connections from a database.
+     */
+    public synchronized void refreshAccessibleConnectionIds() {
+        this.accessibleConnectionIds = readAccessibleConnectionIds();
+    }
+
+    @NotNull
+    private Set<String> readAccessibleConnectionIds() {
+        try {
+            return webSession.getSecurityController()
+                .getAllAvailableObjectsPermissions(SMObjectType.datasource)
+                .stream()
+                .map(SMObjectPermissions::getObjectId)
+                .collect(Collectors.toSet());
+        } catch (DBException e) {
+            webSession.addSessionError(e);
+            log.error("Error reading connection grants", e);
+            return Collections.emptySet();
+        }
+    }
+
+    /**
+     * Checks if connection is accessible for current user.
+     */
+    public boolean isDataSourceAccessible(@NotNull DBPDataSourceContainer dataSource) {
+        return dataSource.isExternallyProvided() ||
+            dataSource.isTemporary() ||
+            webSession.hasPermission(DBWConstants.PERMISSION_ADMIN) ||
+            accessibleConnectionIds.contains(dataSource.getId());
+    }
+
+    /**
+     * Adds a connection if it became accessible.
+     * The method is processed when connection permissions were updated.
+     */
+    public synchronized void addAccessibleConnectionToCache(@NotNull String dsId) {
+        if (!getRMProject().isGlobal()) {
+            return;
+        }
+        this.accessibleConnectionIds.add(dsId);
+        var registry = getDataSourceRegistry();
+        var dataSource = registry.getDataSource(dsId);
+        if (dataSource != null) {
+            addConnection(dataSource);
+            // reflect changes is navigator model
+            registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_ADD, dataSource, true));
+        }
+    }
+
+    /**
+     * Removes a connection if it became not accessible.
+     * The method is processed when connection permissions were updated.
+     */
+    public synchronized void removeAccessibleConnectionFromCache(@NotNull String dsId) {
+        if (!getRMProject().isGlobal()) {
+            return;
+        }
+        var registry = getDataSourceRegistry();
+        var dataSource = registry.getDataSource(dsId);
+        if (dataSource != null) {
+            this.accessibleConnectionIds.remove(dsId);
+            removeConnection(dataSource);
+            // reflect changes is navigator model
+            registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_REMOVE, dataSource));
+            dataSource.dispose();
+        }
+    }
+
+    @NotNull
+    public DataSourceFilter getDataSourceFilter() {
+        return this::isDataSourceAccessible;
+    }
+}

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

@@ -0,0 +1,233 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.WebConnectionInfo;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.WebDataSourceUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
+import org.jkiss.dbeaver.model.navigator.DBNModel;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.model.websocket.event.WSEventType;
+import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
+
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class WebSessionProjectImpl extends WebProjectImpl {
+    private static final Log log = Log.getLog(WebSessionProjectImpl.class);
+    protected final WebSession webSession;
+    private final Map<String, WebConnectionInfo> connections = new HashMap<>();
+    private boolean registryIsLoaded = false;
+
+    public WebSessionProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project
+    ) {
+        super(
+            webSession.getWorkspace(),
+            webSession.getRmController(),
+            webSession.getSessionContext(),
+            project,
+            webSession.getUserPreferenceStore(),
+            RMUtils.getProjectPath(project)
+        );
+        this.webSession = webSession;
+    }
+
+    public WebSessionProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project,
+        @NotNull Path path
+    ) {
+        super(
+            webSession.getWorkspace(),
+            webSession.getRmController(),
+            webSession.getSessionContext(),
+            project,
+            webSession.getUserPreferenceStore(),
+            path
+        );
+        this.webSession = webSession;
+    }
+
+    @Nullable
+    @Override
+    public DBNModel getNavigatorModel() {
+        return webSession.getNavigatorModel();
+    }
+
+    @NotNull
+    @Override
+    protected DBPDataSourceRegistry createDataSourceRegistry() {
+        DBPDataSourceRegistry dataSourceRegistry = super.createDataSourceRegistry();
+        dataSourceRegistry.setAuthCredentialsProvider(webSession);
+        return dataSourceRegistry;
+    }
+
+    private synchronized void addDataSourcesToCache() {
+        if (registryIsLoaded) {
+            return;
+        }
+        getDataSourceRegistry().getDataSources().forEach(this::addConnection);
+        Throwable lastError = getDataSourceRegistry().getLastError();
+        if (lastError != null) {
+            webSession.addSessionError(lastError);
+            log.error("Error refreshing connections from project '" + getId() + "'", lastError);
+        }
+        registryIsLoaded = true;
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        Map<String, WebConnectionInfo> conCopy;
+        synchronized (this.connections) {
+            conCopy = new HashMap<>(this.connections);
+            this.connections.clear();
+        }
+
+        for (WebConnectionInfo connectionInfo : conCopy.values()) {
+            if (connectionInfo.isConnected()) {
+                new DisconnectJob(connectionInfo.getDataSourceContainer()).schedule();
+            }
+        }
+    }
+
+
+    /**
+     * Returns web connection info from cache (if exists).
+     */
+    @Nullable
+    public WebConnectionInfo findWebConnectionInfo(@NotNull String connectionId) {
+        synchronized (connections) {
+            return connections.get(connectionId);
+        }
+    }
+
+    /**
+     * Returns web connection info from cache, adds it to cache if not present.
+     * Throws exception if connection is not found.
+     */
+    @NotNull
+    public WebConnectionInfo getWebConnectionInfo(@NotNull String connectionId) throws DBWebException {
+        WebConnectionInfo connectionInfo = findWebConnectionInfo(connectionId);
+        if (connectionInfo != null) {
+            return connectionInfo;
+        }
+        DBPDataSourceContainer dataSource = getDataSourceRegistry().getDataSource(connectionId);
+        if (dataSource != null) {
+            return addConnection(dataSource);
+        }
+        throw new DBWebException("Connection '%s' not found".formatted(connectionId));
+    }
+
+    /**
+     * Adds connection to project cache.
+     */
+    @NotNull
+    public synchronized WebConnectionInfo addConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
+        WebConnectionInfo connection = new WebConnectionInfo(webSession, dataSourceContainer);
+        synchronized (connections) {
+            connections.put(dataSourceContainer.getId(), connection);
+        }
+        return connection;
+    }
+
+    /**
+     * Removes connection from project cache.
+     */
+    public void removeConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
+        WebConnectionInfo webConnectionInfo = connections.get(dataSourceContainer.getId());
+        if (webConnectionInfo != null) {
+            webConnectionInfo.clearCache();
+            synchronized (connections) {
+                connections.remove(dataSourceContainer.getId());
+            }
+        }
+    }
+
+    /**
+     * Loads connection from registry if they are not loaded.
+     *
+     * @return connections from cache.
+     */
+    public List<WebConnectionInfo> getConnections() {
+        if (!registryIsLoaded) {
+            addDataSourcesToCache();
+            registryIsLoaded = true;
+        }
+        synchronized (connections) {
+            return new ArrayList<>(connections.values());
+        }
+    }
+
+    /**
+     * updates data sources based on event in web session
+     *
+     * @param dataSourceIds list of updated connections
+     * @param type          type of event
+     */
+    public synchronized boolean updateProjectDataSources(@NotNull List<String> dataSourceIds, @NotNull WSEventType type) {
+        var sendDataSourceUpdatedEvent = false;
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        // save old connections
+        var oldDataSources = dataSourceIds.stream()
+            .map(registry::getDataSource)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toMap(
+                DBPDataSourceContainer::getId,
+                ds -> new DataSourceDescriptor((DataSourceDescriptor) ds, ds.getRegistry())
+            ));
+        if (type == WSEventType.DATASOURCE_CREATED || type == WSEventType.DATASOURCE_UPDATED) {
+            registry.refreshConfig(dataSourceIds);
+        }
+        for (String dsId : dataSourceIds) {
+            DataSourceDescriptor ds = (DataSourceDescriptor) registry.getDataSource(dsId);
+            if (ds == null) {
+                continue;
+            }
+            switch (type) {
+                case DATASOURCE_CREATED -> {
+                    addConnection(ds);
+                    sendDataSourceUpdatedEvent = true;
+                }
+                case DATASOURCE_UPDATED -> // if settings were changed we need to send event
+                    sendDataSourceUpdatedEvent |= !ds.equalSettings(oldDataSources.get(dsId));
+                case DATASOURCE_DELETED -> {
+                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
+                    if (registry instanceof DBPDataSourceRegistryCache dsrc) {
+                        dsrc.removeDataSourceFromList(ds);
+                    }
+                    removeConnection(ds);
+                    sendDataSourceUpdatedEvent = true;
+                }
+                default -> {
+                }
+            }
+        }
+        return sendDataSourceUpdatedEvent;
+    }
+}

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

@@ -0,0 +1,32 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.auth;
+
+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";
+    String CB_FORCE_SESSIONS_LOGOUT = "forceSessionsLogout";
+
+    // Default max idle time (10 minutes)
+    long MAX_SESSION_IDLE_TIME = 10 * 60 * 1000;
+}

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

@@ -0,0 +1,30 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.auth.SMCredentials;
+import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+
+public class NoAuthCredentialsProvider implements SMCredentialsProvider {
+    @Nullable
+    @Override
+    public SMCredentials getActiveUserCredentials() {
+        return null;
+    }
+}

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

@@ -0,0 +1,41 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+
+import java.util.Map;
+
+/**
+ * Auth
+ * Authenticates user using external user identity
+ */
+public interface SMAuthProviderAssigner {
+
+    @NotNull
+    SMAutoAssign detectAutoAssignments(
+        @NotNull DBRProgressMonitor monitor,
+        @NotNull SMAuthProviderCustomConfiguration providerConfig,
+        @NotNull Map<String, Object> authParameters
+    ) throws DBException;
+
+    String getExternalTeamIdMetadataFieldName();
+
+}

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

@@ -0,0 +1,72 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.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 org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+
+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,
+        @Nullable SMAuthProviderCustomConfiguration 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,
+        @Nullable SMAuthProviderCustomConfiguration customConfiguration,
+        @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

@@ -0,0 +1,57 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+
+import java.util.Map;
+
+/**
+ * Federated auth provider.
+ * Provides links to external auth resource
+ */
+public interface SMAuthProviderFederated extends SMSignOutLinkProvider {
+
+    @NotNull
+    String getSignInLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
+    @Override
+    default String getUserSignOutLink(
+        @NotNull SMAuthProviderCustomConfiguration providerConfig,
+        @NotNull Map<String, Object> userCredentials
+    ) throws DBException {
+        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters());
+    }
+
+    @Nullable
+    String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
+    @Nullable
+    String getAcsLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
+    @Nullable
+    String getEntityIdLink(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-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.auth;
+
+import 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/SMBruteForceProtected.java

@@ -0,0 +1,25 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.NotNull;
+
+import java.util.Map;
+
+public interface SMBruteForceProtected {
+    Object getInputUsername(@NotNull Map<String, Object> cred);
+}

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

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

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

@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth;
+
+import org.jkiss.code.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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
  */
 package io.cloudbeaver.auth.provider;
 
-import io.cloudbeaver.auth.DBAAuthProviderExternal;
+import io.cloudbeaver.auth.SMAuthProviderExternal;
 import io.cloudbeaver.model.user.WebUser;
-import org.jkiss.dbeaver.model.auth.DBASession;
+import org.jkiss.dbeaver.model.auth.SMSession;
 import org.jkiss.utils.CommonUtils;
 
 /**
  * Abstract external auth provider
  */
-public abstract class AbstractExternalAuthProvider<SESSION extends DBASession> implements DBAAuthProviderExternal<SESSION> {
+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";

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/fa/AbstractSessionExternal.java

@@ -0,0 +1,79 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.auth.provider.fa;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.auth.*;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+public abstract class AbstractSessionExternal implements SMSessionExternal {
+
+    @NotNull
+    protected final Map<String, Object> authParameters;
+    @NotNull
+    protected final SMSession parentSession;
+    @NotNull
+    protected final SMAuthSpace space;
+
+    protected AbstractSessionExternal(
+        @NotNull SMSession parentSession,
+        @NotNull SMAuthSpace space,
+        @NotNull Map<String, Object> authParameters
+    ) {
+        this.parentSession = parentSession;
+        this.space = space;
+        this.authParameters = authParameters;
+    }
+
+    @NotNull
+    @Override
+    public SMAuthSpace getSessionSpace() {
+        return space;
+    }
+
+    @NotNull
+    @Override
+    public SMSessionContext getSessionContext() {
+        return this.parentSession.getSessionContext();
+    }
+
+    @Nullable
+    @Override
+    public SMSessionPrincipal getSessionPrincipal() {
+        return parentSession.getSessionPrincipal();
+    }
+
+    @NotNull
+    @Override
+    public LocalDateTime getSessionStart() {
+        return parentSession.getSessionStart();
+    }
+
+    @Override
+    public void close() {
+        // do nothing
+    }
+
+    @Override
+    public Map<String, Object> getAuthParameters() {
+        return authParameters;
+    }
+}

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

@@ -0,0 +1,25 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.auth.provider.local;
+
+//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/auth/provisioning/SMProvisioner.java

@@ -0,0 +1,38 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.auth.provisioning;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+import org.jkiss.dbeaver.model.security.user.SMUserProvisioning;
+
+import java.util.List;
+
+public interface SMProvisioner {
+    @NotNull
+    List<SMUserProvisioning> listExternalUsers(
+        @NotNull WebSession webSession,
+        @NotNull SMAuthProviderCustomConfiguration customConfiguration,
+        @NotNull SMProvisioningFilter filter
+    ) throws DBException;
+
+    default boolean isAuthRoleProvided(SMAuthProviderCustomConfiguration configuration) {
+        return false;
+    }
+}

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

@@ -0,0 +1,28 @@
+package io.cloudbeaver.auth.provisioning;
+
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.data.json.JSONUtils;
+
+import java.util.Map;
+
+public class SMProvisioningFilter {
+    @Nullable
+    private final Integer offset;
+    @Nullable
+    private final Integer limit;
+
+    public SMProvisioningFilter(Map<String, Object> params) {
+        this.offset = JSONUtils.getInteger(params, "offset");
+        this.limit = JSONUtils.getInteger(params, "limit");
+    }
+
+    @Nullable
+    public Integer getOffset() {
+        return offset;
+    }
+
+    @Nullable
+    public Integer getLimit() {
+        return limit;
+    }
+}

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -0,0 +1,57 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import 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,506 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import 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.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.*;
+import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
+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.RMConstants;
+import org.jkiss.dbeaver.model.rm.RMProjectPermission;
+import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
+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 Log log = Log.getLog(WebConnectionInfo.class);
+    public static final String SECURED_VALUE = "********";
+
+    private static final String FEATURE_HAS_TOOLS = "hasTools";
+    private static final String FEATURE_CONNECTED = "connected";
+    private static final String FEATURE_VIRTUAL = "virtual";
+    private static final String FEATURE_TEMPORARY = "temporary";
+    private static final String FEATURE_READ_ONLY = "readOnly";
+    private static final String FEATURE_PROVIDED = "provided";
+    private static final String FEATURE_MANAGEABLE = "manageable";
+
+    private static final String TOOL_SESSION_MANAGER = "sessionManager";
+    
+    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;
+    private transient List<DBRRunnableParametrized<WebConnectionInfo>> closeListeners = null;
+
+    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(FEATURE_CONNECTED);
+            if (!getTools().isEmpty()) {
+                features.add(FEATURE_HAS_TOOLS);
+            }
+        }
+        if (dataSourceContainer.isHidden()) {
+            features.add(FEATURE_VIRTUAL);
+        }
+        if (dataSourceContainer.isTemporary()) {
+            features.add(FEATURE_TEMPORARY);
+        }
+        if (dataSourceContainer.isConnectionReadOnly()) {
+            features.add(FEATURE_READ_ONLY);
+        }
+        if (dataSourceContainer.isProvided()) {
+            features.add(FEATURE_PROVIDED);
+        }
+        if (dataSourceContainer.isManageable()) {
+            features.add(FEATURE_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 user provided credentials
+        DBPConnectionConfiguration configWithAuth = new DBPConnectionConfiguration(dataSourceContainer.getConnectionConfiguration());
+
+        // 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 clearCache() {
+        this.savedAuthProperties = null;
+        this.savedNetworkCredentials = null;
+        this.fireCloseListeners();
+    }
+
+    public void fireCloseListeners() {
+        if (closeListeners != null) {
+            for (DBRRunnableParametrized<WebConnectionInfo> listener : closeListeners) {
+                try {
+                    listener.run(this);
+                } catch (Exception e) {
+                    log.debug(e);
+                }
+            }
+            closeListeners = null;
+        }
+    }
+
+    @Property
+    public Map<String, String> getMainPropertyValues() {
+        Map<String, String> mainProperties = new LinkedHashMap<>();
+        mainProperties.put(DBConstants.PROP_HOST, getHost());
+        mainProperties.put(DBConstants.PROP_PORT, getPort());
+        mainProperties.put(DBConstants.PROP_DATABASE, getDatabaseName());
+        mainProperties.put(DBConstants.PROP_SERVER, getServerName());
+        return mainProperties;
+    }
+
+    @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 webProject)) {
+            return false;
+        }
+        return SMUtils.hasProjectPermission(session, webProject.getRMProject(), projectPermission);
+    }
+
+    private boolean canViewReadOnlyConnections() {
+        if (isCanEdit()) {
+            return true;
+        }
+        BaseWebAppConfiguration appConfig = (BaseWebAppConfiguration) WebAppUtils.getWebApplication().getAppConfiguration();
+        return appConfig.isShowReadOnlyConnectionInfo();
+
+    }
+
+    public void addCloseListener(DBRRunnableParametrized<WebConnectionInfo> listener) {
+        if (closeListeners == null) {
+            closeListeners = new ArrayList<>();
+        }
+        closeListeners.add(listener);
+    }
+
+    @Property
+    public int getKeepAliveInterval() {
+        return dataSourceContainer.getConnectionConfiguration().getKeepAliveInterval();
+    }
+
+    @Property
+    public boolean isAutocommit() {
+        Boolean isAutoCommit = dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
+        if (isAutoCommit == null) {
+            return true;
+        }
+        return isAutoCommit;
+    }
+
+    @Property
+    public List<WebSecretInfo> getSharedSecrets() throws DBException {
+        return dataSourceContainer.listSharedCredentials()
+            .stream()
+            .map(WebSecretInfo::new)
+            .collect(Collectors.toList());
+    }
+
+    @NotNull
+    @Property
+    public List<String> getTools() {
+        if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
+            return List.of();
+        }
+        List<String> tools = new ArrayList<>();
+        // checks inside that datasource is not null in container, and it is adaptable to session manager class
+        if (DBUtils.getAdapter(DBAServerSessionManager.class, dataSourceContainer) != null) {
+            tools.add(TOOL_SESSION_MANAGER);
+        }
+        return tools;
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2022 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package io.cloudbeaver.model;
 
 import io.cloudbeaver.DBWebException;
-import io.cloudbeaver.WebServiceUtils;
 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;
@@ -65,13 +65,13 @@ public class WebConnectionOriginInfo implements WebObjectOrigin {
     @Nullable
     @Override
     public String getIcon() {
-        return WebServiceUtils.makeIconId(origin.getIcon());
+        return WebCommonUtils.makeIconId(origin.getIcon());
     }
 
     @NotNull
     @Override
     public Map<String, Object> getConfiguration() {
-        return origin.getConfiguration();
+        return origin.getDataSourceConfiguration();
     }
 
     @Property
@@ -82,7 +82,7 @@ public class WebConnectionOriginInfo implements WebObjectOrigin {
             if (details == null) {
                 return new WebPropertyInfo[0];
             }
-            return WebServiceUtils.getObjectProperties(session, details);
+            return WebCommonUtils.getObjectProperties(session, details);
         } catch (DBException e) {
             throw new DBWebException("Error reading origin details", e);
         }