CB-5737 global project path fix (#2955)

Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>

.github/workflows/backend-build.yml

@@ -0,0 +1,56 @@
+name: Backend Build
+
+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-backend:
+    name: Backend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+          cache: maven
+
+      - uses: stCarolas/setup-maven@v5
+        with:
+          maven-version: 3.9.0
+
+      - name: Give permissions
+        run: |
+          sudo chmod 777 ../
+        shell: bash
+
+      - name: Determine branches
+        id: determine-branch
+        run: |
+          echo "pr_branch=${{ github.head_ref }}" >> $GITHUB_ENV
+          echo "base_branch=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
+  
+      - name: Clone dbeaver/dbeaver
+        id: clone-repo
+        run: |
+          git clone -b ${{ env.pr_branch }} https://github.com/dbeaver/dbeaver.git ../dbeaver || git clone -b ${{ env.base_branch }} https://github.com/dbeaver/dbeaver.git ../dbeaver
+
+      - name: Run build script
+        run: ./build-backend.sh
+        shell: bash
+        working-directory: ./deploy
+
+      - name: Archive build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: backend-build-artifacts
+          path: deploy/cloudbeaver
+          if-no-files-found: error

.github/workflows/backend-lint.yml

@@ -0,0 +1,40 @@
+name: Backend Lint
+
+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:
+    inputs:
+      skip_cache:
+        required: false
+        type: string
+
+jobs:
+  lint:
+    name: Backend
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Checkout checkstyle config repository
+        uses: actions/checkout@v4
+        with:
+          repository: dbeaver/dbeaver
+          path: dbeaver-config
+
+      - name: Copy checkstyle config
+        run: cp dbeaver-config/dbeaver-checkstyle-config.xml ./dbeaver-checkstyle-config.xml
+
+      - name: Remove checkstyle config directory
+        run: rm -rf dbeaver-config
+
+      - uses: dbelyaev/action-checkstyle@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          reporter: github-pr-review
+          filter_mode: diff_context
+          checkstyle_config: ./dbeaver-checkstyle-config.xml
+          fail_on_error: true

.github/workflows/common-cleanup.yml

@@ -0,0 +1,57 @@
+name: Cleanup checks
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  delete-caches:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys. 
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge
+
+  # delete-docker-image:
+  #   name: Delete Docker Image
+  #   if: github.event.pull_request.merged == true
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Check out the repository
+  #       uses: actions/checkout@v4
+
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
+
+  #     - name: Determine Docker Image Tag
+  #       run: |
+  #         REPO_NAME=$(basename ${{ github.repository }})
+  #         IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/$REPO_NAME
+  #         BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+  #         TAG_NAME=$(echo $BRANCH_NAME | sed 's/[^a-zA-Z0-9._-]/-/g')
+  #         echo "image=$IMAGE_NAME:$TAG_NAME" >> $GITHUB_ENV
+
+  #     - name: Log in to GitHub Container Registry
+  #       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+
+  #     - name: Delete Docker Image
+  #       run: |
+  #         docker rmi ${{ env.image }}
+  #         echo "Deleted image: ${{ env.image }}"

.github/workflows/common.yml

@@ -0,0 +1,56 @@
+name: Check
+
+on:
+  push:
+    branches:
+      - devel
+  pull_request:
+    branches:
+      - devel
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    inputs:
+      skip_cache:
+        description: "Skip cache restoration"
+        required: false
+        default: "false"
+
+jobs:
+  call-backend-build:
+    name: Build
+    uses: ./.github/workflows/backend-build.yml
+
+  call-frontend-build:
+    name: Build
+    uses: ./.github/workflows/frontend-build.yml
+    with:
+      skip_cache: ${{ github.event.inputs.skip_cache }}
+
+  call-frontend-lint:
+    name: Lint
+    needs: call-frontend-build
+    uses: ./.github/workflows/frontend-lint.yml
+
+  call-backend-lint:
+    name: Lint
+    uses: ./.github/workflows/backend-lint.yml
+
+  # 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

.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,91 @@
+name: Frontend Build
+
+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:
+    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: Frontend
+    runs-on: ubuntu-latest
+
+    outputs:
+      build-status: ${{ steps.build.outcome }}
+      test-status: ${{ steps.test.outcome }}
+
+    defaults:
+      run:
+        working-directory: ./webapp
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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'
+        uses: borales/actions-yarn@v5
+        with:
+          dir: webapp
+          cmd: clean
+
+      - name: yarn install --frozen-lockfile
+        uses: borales/actions-yarn@v5
+        with:
+          dir: webapp
+          cmd: install
+
+      - name: build
+        id: build
+        uses: borales/actions-yarn@v5
+        with:
+          dir: webapp/packages/product-default
+          cmd: bundle
+
+      - name: test
+        id: test
+        uses: borales/actions-yarn@v5
+        with:
+          dir: webapp
+          cmd: 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-cache.yml

@@ -1,76 +0,0 @@
-name: frontend-cache
-
-on:
-  push:
-    branches: ["devel"]
-    paths:
-      - "webapp/**"
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./webapp
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: restore yarn cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: restore node_modules
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-
-      - name: restore typescript cache
-        uses: actions/cache@v3
-        with:
-          path: "**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-dist-
-
-      - name: yarn install
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: install
-
-      - name: yarn lerna bootstrap
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: lerna bootstrap
-
-      - name: build
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp/packages/product-default
-          cmd: build # build tyescript source code
-
-      - name: test
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: lerna run test # build packages that have test script

.github/workflows/frontend-cleanup.yaml

@@ -1,29 +0,0 @@
-name: cleanup caches by a branch
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cleanup
-        run: |
-          gh extension install actions/gh-actions-cache
-
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
-
-          ## Setting this to not fail the workflow while deleting cache keys. 
-          set +e
-          echo "Deleting caches..."
-          for cacheKey in $cacheKeysForPR
-          do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

.github/workflows/frontend-lint.yml

@@ -0,0 +1,45 @@
+name: Frontend Lint
+
+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:
+  lint:
+    name: Frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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: yarn install --frozen-lockfile
+        uses: borales/actions-yarn@v5
+        with:
+          dir: webapp
+          cmd: install
+
+      - name: Lint
+        uses: reviewdog/action-eslint@v1
+        with:
+          reporter: github-pr-review
+          filter_mode: file
+          workdir: webapp
+          fail_on_error: true
+          eslint_flags: "--ext .ts,.tsx"

.github/workflows/frontend.yml

@@ -1,80 +0,0 @@
-name: frontend
-
-on:
-  # Triggers the workflow on push or pull request events but only for the "devel" branch
-  pull_request:
-    branches: ["devel"]
-    paths:
-      - "webapp/**" # monitor for the frontend changes
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  # Allows you to reuse workflows by referencing their YAML files
-  workflow_call:
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./webapp
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: restore yarn cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: restore node_modules
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-
-      - name: restore typescript cache
-        uses: actions/cache@v3
-        with:
-          path: "**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-dist-
-
-      - name: yarn install
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: install
-
-      - name: yarn lerna bootstrap
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: lerna bootstrap
-
-      - name: build
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp/packages/product-default
-          cmd: bundle
-
-      - name: test
-        uses: borales/actions-yarn@v4
-        with:
-          dir: webapp
-          cmd: lerna run test

.github/workflows/validation.yml

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

.gitignore

@@ -26,7 +26,7 @@ dist/
 
 *.iml
 /idea/
-.idea/
+
 
 ## Mac OS
 .DS_Store
@@ -40,6 +40,7 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/
 .classpath
 .settings/
 
+workspace-dev-ce/
 deploy/cloudbeaver
 server/**/target
 apps/**/target

.vscode/extensions.json

@@ -15,7 +15,6 @@
     "streetsidesoftware.code-spell-checker",
     "streetsidesoftware.code-spell-checker-russian",
     "syler.sass-indented",
-    "VisualStudioExptTeam.intellicode-api-usage-examples",
     "VisualStudioExptTeam.vscodeintellicode",
     "yzhang.markdown-all-in-one",
     "GraphQL.vscode-graphql-syntax",

.vscode/launch.json

@@ -4,95 +4,73 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Chrome",
-      "url": "http://127.0.0.1:3100",
+      "name": "CloudBeaver CE",
+      "url": "http://localhost:8080",
       "webRoot": "${workspaceFolder}/..",
+      "outFiles": [
+        "${workspaceFolder}/../cloudbeaver/packages/**/dist/**/*.{js,jsx}"
+      ],
+      "smartStep": true,
       "sourceMaps": true,
-      "sourceMapPathOverrides": {
-        "webpack:///*": "${workspaceFolder}/../*"
-      },
-      "skipFiles": [
-        "<node_internals>/**",
-        "**/node_modules/**",
-        "${workspaceFolder}/webapp/**/node_modules/**/*.js",
-        "${workspaceFolder}/webapp/**/dist/**/*.js"
-      ]
+      "disableNetworkCache": true,
+      "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
     },
     {
       "type": "java",
-      "name": "CloudBeaver CE",
+      "name": "CloudBeaver CE Server",
       "cwd": "${workspaceFolder}/../opt/cbce",
       "request": "launch",
-      "mainClass": "org.eclipse.equinox.launcher.Main",
-      "windows": {
-        "type": "java",
-        "name": "CloudBeaver CE",
-        "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar"
-        ],
-        "args": [
-          "-product",
-          "io.cloudbeaver.product.ce.product",
-          "-configuration",
-          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
-          "-dev",
-          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
-          "-os",
-          "win32",
-          "-ws",
-          "win32",
-          "-arch",
-          "x86_64",
-          "-nl",
-          "en",
-          "-showsplash",
-          "-web-config",
-          "conf/cloudbeaver.conf"
-        ],
-        "vmArgs": [
-          "-XX:+IgnoreUnrecognizedVMOptions",
-          "--add-modules=ALL-SYSTEM",
-          "-Xms64m",
-          "-Xmx1024m",
-          "-Declipse.pde.launch=true"
-        ]
-      },
-      "osx": {
-        "type": "java",
-        "name": "CloudBeaver CE",
-        "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar"
-        ],
-        "args": [
-          "-product",
-          "io.cloudbeaver.product.ce.product",
-          "-configuration",
-          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
-          "-dev",
-          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
-          "-os",
-          "macosx",
-          "-ws",
-          "cocoa",
-          "-arch",
-          "aarch64",
-          "-nl",
-          "en_US",
-          "-showsplash"
-        ],
-        "vmArgs": [
-          "-XX:+IgnoreUnrecognizedVMOptions",
-          "--add-modules=ALL-SYSTEM",
-          "-Xms64m",
-          "-Xmx1024m",
-          "-Declipse.pde.launch=true",
-          "-XstartOnFirstThread"
-        ]
-      }
+      "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

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

.vscode/tasks.json

@@ -17,7 +17,7 @@
       "type": "shell",
       "command": "yarn",
       "group": "test",
-      "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"]
+      "args": ["test"]
     },
     {
       "label": "Run DevServer CE",
@@ -33,6 +33,24 @@
         "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",
@@ -50,11 +68,45 @@
         "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; yarn lerna bootstrap",
-      "args": []
+      "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": [
@@ -62,8 +114,8 @@
       "type": "pickString",
       "id": "stage.ce",
       "description": "CE Stage servers",
-      "default": "http://127.0.0.1:8978/",
-      "options": ["http://127.0.0.1:8978/"]
+      "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,60 +19,49 @@ 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 23.2.2 - 2023-10-09
+### 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.
 
-- The 'Save credentials' checkbox has been removed from a template creating form as credentials are not stored in templates;
-- Different bug fixes and enhancements have been made.
-
-### CloudBeaver 23.2.1 - 2023-09-25
-
-- The Output tab has been implemented, which includes warnings, info and notices generated by the database when executing user queries;
-- Scrollbars have been made theme-independent, resolving interface issues with light theme;
-- Fixed an issue in the SQL editor where it was not possible to switch the active schema when working with Oracle databases;
-- Different bug fixes and enhancements have been made.
-
-
-23.2.0 - 2023-09-04
-
-- Performance:
-   - Pagination has been added to the Navigation tree and metadata viewer, allowing working with more than 1000 database items;
-- Access Management:
-   - Access permissions can be specified for pre-configured connections via the configuration file;
-   - Reverse Proxy authentication now includes the option to provide users' First name and Last name;
-- Authorization:
-   - The SSL option is now available for establishing connections in MySQL, PostgreSQL, Clickhouse;
-- Connections:
-   - Connections are consistently displayed now when they are pre-configured into the workspace in the Global Configuration json file
-- Navigation tree:
-   - The filters for the Navigation tree now allow hiding and showing schemas within the interface.
-   - The search request considers file names and excludes the .sql file extension for now;
+### 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:
-   - The ability to rearrange columns in the Data Editor has been added;
-   - The ability to use custom functions in the Grouping panel has been added;
-- Administration:
-   - New Settings panel displays the product configuration settings such as Minimum fetch size, Maximum fetch size, and Default fetch size from the Data Editor;
-   - "Connection Management" tab has been renamed to "Connection Templates" - now only connection templates are displayed;
+  -    Added additional notifications about the restricted operations
+  -    Enhanced IPv6 and DateTime32 data representation for Clickhouse
+  -    Data editing was fixed for DuckDB
 - SQL Editor:
-   - Users can simultaneously edit resources for now, allowing them to work together;
-   - Support for displaying tables with nested arrays of objects has been added;
-   - The ability to compress export files allowed to increase in download speed, especially for larger files;
-   - UX in the search bar has been improved  - users can delete a query or request by clicking on the cross icon;
-- Driver management:
-   - Custom settings have been added to the interface for the following dialogue connections: SQLite, DB2, SQL Server, MySQL, Oracle and PostgreSQL;
-   - Trino driver has been updated;
-- Security:
-   - Password autofill functionality was removed;
-   - The "eye" icon for password fields has been removed - the passwords entered into fields will not be displayed in the interface for now;
-- Many small bug fixes, enhancements, and improvements have been made
+  -    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:
+  -    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))
 
+## Contribution
+As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
 
-### Old CloudBeaver releases
-
-You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
-
+[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)

apps/h2-query-executor/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.2.220</version>
+            <version>2.1.214</version>
         </dependency>
     </dependencies>
     <build>

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

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

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

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

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

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

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

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

config/core/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

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

config/core/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
-    }
-}

config/sample-databases/DefaultConfiguration/cloudbeaver.conf

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

config/sample-databases/README.md

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

config/sample-databases/SQLiteConfiguration/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"
-				}
-			}
-		}
-	}
-}

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

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

config/sample-databases/SQLiteConfiguration/cloudbeaver.conf

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

config/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

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-sqlite.bat

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

deploy/build-sqlite.sh

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

deploy/build.bat

@@ -1,11 +1,6 @@
 @echo off
 
 rem command line arguments
-SET CONFIGURATION_PATH=%1
-SET SAMPLE_DATABASE_PATH=%2
-
-IF "%CONFIGURATION_PATH%"=="" SET CONFIGURATION_PATH="..\config\sample-databases\DefaultConfiguration"
-echo "Configuration path=%CONFIGURATION_PATH%"
 
 echo Clone and build Cloudbeaver
 
@@ -24,6 +19,7 @@ cd ..\..
 echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
+IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
@@ -39,13 +35,9 @@ xcopy /E /Q ..\server\product\web-server\target\products\io.cloudbeaver.product\
 copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\samples
 
-IF NOT "%SAMPLE_DATABASE_PATH%"=="" (
-    mkdir cloudbeaver\samples\db
-    xcopy /E /Q %SAMPLE_DATABASE_PATH% cloudbeaver\samples\db >NUL
-)
+
 copy ..\config\core\* cloudbeaver\conf >NUL
-copy %CONFIGURATION_PATH%\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
-copy %CONFIGURATION_PATH%\*.conf cloudbeaver\conf >NUL
+copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
 
 move drivers cloudbeaver >NUL
 

deploy/build.sh

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

deploy/docker/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

@@ -1,5 +1,10 @@
-FROM eclipse-temurin:17.0.4.1_1-jre-focal
+FROM dbeaver/base-java
 
+MAINTAINER DBeaver Corp, devops@dbeaver.com
+
+RUN apt-get update; \
+    apt-get upgrade -y; 
+    
 COPY cloudbeaver /opt/cloudbeaver
 
 EXPOSE 8978

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,5 +1,5 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 
@@ -10,4 +10,38 @@ IF NOT EXIST workspace\.metadata (
     )
 )
 
-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 -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 && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] && 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} -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 -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

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

org.jkiss.cloudbeaver.tp.target

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="org.jkiss.tp.cloudbeaver">
+<target name="org.jkiss.cloudbeaver.tp">
 	<locations>
-		<location path="../eclipse/Eclipse.app/Contents/Eclipse/plugins" type="Directory"/>
-		<location path="../eclipse/eclipse/plugins" type="Directory"/>
+		<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

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

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.39.qualifier
-Bundle-Release-Date: 20231023
+Bundle-Version: 1.0.62.qualifier
+Bundle-Release-Date: 20241007
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -18,27 +18,32 @@ Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.bundle.graphql.java;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
  com.google.gson;visibility:=reexport,
- jakarta.servlet-api;bundle-version="[4.0.0,4.0.0]";visibility:=reexport
+ jakarta.servlet-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.rm.fs.nio,
  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

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

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

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

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

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

@@ -14,11 +14,6 @@
             <meta.element />
          </appInfo>
       </annotation>
-      <complexType>
-         <sequence>
-            <element ref="propertyGroup"/>
-         </sequence>
-      </complexType>
    </element>
 
    <element name="driver">

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,21 @@
  */
 package io.cloudbeaver;
 
-import org.eclipse.core.resources.IProject;
 import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
+import org.jkiss.dbeaver.model.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.dbeaver.model.rm.RMUtils;
-import org.jkiss.dbeaver.registry.BaseProjectImpl;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.Pair;
 
 import java.nio.file.Path;
 import java.util.Collection;
 
-public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {
+public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {
 
     @NotNull
     private final RMProject project;
@@ -40,21 +38,18 @@ public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerP
     @NotNull
     private final Path path;
     @NotNull
-    protected final DataSourceFilter dataSourceFilter;
     private final RMController resourceController;
 
     public BaseWebProjectImpl(
         @NotNull DBPWorkspace workspace,
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
-        @NotNull RMProject project,
-        @NotNull DataSourceFilter dataSourceFilter
+        @NotNull RMProject project
     ) {
         super(workspace, sessionContext);
         this.resourceController = resourceController;
         this.path = RMUtils.getProjectPath(project);
         this.project = project;
-        this.dataSourceFilter = dataSourceFilter;
     }
 
     @NotNull
@@ -62,6 +57,12 @@ public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerP
         return resourceController;
     }
 
+    @NotNull
+    @Override
+    public RMProject getRMProject() {
+        return project;
+    }
+
     @Override
     public boolean isVirtual() {
         return true;
@@ -85,12 +86,6 @@ public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerP
         return path;
     }
 
-    @Nullable
-    @Override
-    public IProject getEclipseProject() {
-        return null;
-    }
-
     @Override
     public boolean isOpen() {
         return true;
@@ -106,11 +101,6 @@ public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerP
         return false;
     }
 
-    @NotNull
-    public RMProject getRmProject() {
-        return this.project;
-    }
-
     /**
      * Method for Bulk Update of resources properties paths
      *

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,19 +22,22 @@ import org.jkiss.dbeaver.model.rm.RMConstants;
 /**
  * General constants
  */
-public class DBWConstants {
+public interface DBWConstants {
 
-    public static final String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
+    String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
 
-    public static final String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
-    public static final String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
+    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
+    String PERMISSION_SECRET_MANAGER = "secret-manager";
 
-    public static final String PERMISSION_EDIT_STRUCTURE = "edit-meta";
-    public static final String PERMISSION_EDIT_DATA = "edit-data";
 
-    public static final String STATE_ATTR_SIGN_IN_STATE = "state.signin";
+    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
+    String PERMISSION_EDIT_DATA = "edit-data";
 
-    public enum SignInState {
+    String STATE_ATTR_SIGN_IN_STATE = "state.signin";
+    String WORK_DATA_FOLDER_NAME = ".work-data";
+
+    enum SignInState {
         GLOBAL,
         EMBEDDED
     }

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import graphql.ErrorType;
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
 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;
 
@@ -38,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";
@@ -65,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() {
@@ -128,14 +125,14 @@ public class DBWebException extends DBException implements GraphQLError {
             //stString = stString.substring(divPos + 1).trim();
         }
         extensions.put("stackTrace", stString.trim());
-        int errorCode = getErrorCode();
+        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);
         }

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

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

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

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

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

@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+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()
+        );
+    }
+}

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,29 +17,35 @@
 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;
 
 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 DataSourceFilter dataSourceFilter
+        @NotNull DBPPreferenceStore preferenceStore
     ) {
-        super(workspace, resourceController, sessionContext, project, dataSourceFilter);
+        super(workspace, resourceController, sessionContext, project);
+        this.preferenceStore = preferenceStore;
     }
 
+    @Nullable
     @Override
     public Object getProjectProperty(String propName) {
         try {
@@ -51,7 +57,7 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
     }
 
     @Override
-    public void setProjectProperty(String propName, Object propValue) {
+    public void setProjectProperty(@NotNull String propName, @Nullable Object propValue) {
         try {
             getResourceController().setProjectProperty(getId(), propName, propValue);
         } catch (DBException e) {
@@ -64,13 +70,24 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
         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()),
-            dataSourceFilter
+            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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,41 @@
  */
 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.websocket.event.WSEventType;
+import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
+
+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;
 
-    private final WebSession webSession;
-
-    public WebSessionProjectImpl(@NotNull WebSession webSession, @NotNull RMProject project, @NotNull DataSourceFilter dataSourceFilter) {
-        super(webSession.getWorkspace(), webSession.getRmController(), webSession.getSessionContext(), project, dataSourceFilter);
+    public WebSessionProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project
+    ) {
+        super(
+            webSession.getWorkspace(),
+            webSession.getRmController(),
+            webSession.getSessionContext(),
+            project,
+            webSession.getUserPreferenceStore()
+        );
         this.webSession = webSession;
     }
 
@@ -36,4 +59,156 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ public interface CBAuthConstants {
     String CB_AUTH_ID_REQUEST_PARAM = "authId";
     String CB_AUTO_LOGIN_REQUEST_PARAM = "autoLogin";
     String CB_REDIRECT_URL_REQUEST_PARAM = "redirectUrl";
+    String CB_FORCE_SESSIONS_LOGOUT = "forceSessionsLogout";
 
     // Default max idle time (10 minutes)
     long MAX_SESSION_IDLE_TIME = 10 * 60 * 1000;

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.slf4j;
+package io.cloudbeaver.auth;
 
-import ch.qos.logback.classic.spi.LogbackServiceProvider;
+import org.jkiss.code.NotNull;
 
-public class CloudBeaverLogServiceProvider extends LogbackServiceProvider {
-    public CloudBeaverLogServiceProvider() {
-    }
+import java.util.Map;
+
+public interface SMBruteForceProtected {
+    Object getInputUsername(@NotNull Map<String, Object> cred);
 }

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

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

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

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

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

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

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,4 +31,8 @@ public interface SMProvisioner {
         @NotNull SMAuthProviderCustomConfiguration customConfiguration,
         @NotNull SMProvisioningFilter filter
     ) throws DBException;
+
+    default boolean isAuthRoleProvided(SMAuthProviderCustomConfiguration configuration) {
+        return false;
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,11 @@ 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.DBConstants;
-import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.DBPDataSourceFolder;
+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;
@@ -40,6 +39,7 @@ 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;
@@ -56,6 +56,17 @@ 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;
@@ -243,22 +254,25 @@ public class WebConnectionInfo {
         List<String> features = new ArrayList<>();
 
         if (dataSourceContainer.isConnected()) {
-            features.add("connected");
+            features.add(FEATURE_CONNECTED);
+            if (!getTools().isEmpty()) {
+                features.add(FEATURE_HAS_TOOLS);
+            }
         }
         if (dataSourceContainer.isHidden()) {
-            features.add("virtual");
+            features.add(FEATURE_VIRTUAL);
         }
         if (dataSourceContainer.isTemporary()) {
-            features.add("temporary");
+            features.add(FEATURE_TEMPORARY);
         }
         if (dataSourceContainer.isConnectionReadOnly()) {
-            features.add("readOnly");
+            features.add(FEATURE_READ_ONLY);
         }
         if (dataSourceContainer.isProvided()) {
-            features.add("provided");
+            features.add(FEATURE_PROVIDED);
         }
         if (dataSourceContainer.isManageable()) {
-            features.add("manageable");
+            features.add(FEATURE_MANAGEABLE);
         }
 
         return features.toArray(new String[0]);
@@ -384,6 +398,16 @@ public class WebConnectionInfo {
         }
     }
 
+    @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();
@@ -421,10 +445,10 @@ public class WebConnectionInfo {
 
     private boolean hasProjectPermission(RMProjectPermission projectPermission) {
         DBPProject project = dataSourceContainer.getProject();
-        if (!(project instanceof WebProjectImpl)) {
+        if (!(project instanceof WebProjectImpl webProject)) {
             return false;
         }
-        return SMUtils.hasProjectPermission(session, ((WebProjectImpl) project).getRmProject(), projectPermission);
+        return SMUtils.hasProjectPermission(session, webProject.getRMProject(), projectPermission);
     }
 
     private boolean canViewReadOnlyConnections() {
@@ -443,4 +467,40 @@ public class WebConnectionInfo {
         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-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@ import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
+import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
+import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.LinkedHashMap;
@@ -83,8 +85,11 @@ public class WebNetworkHandlerConfig {
     @NotNull
     public Map<String, String> getSecureProperties() {
         Map<String, String> secureProperties = new LinkedHashMap<>(configuration.getSecureProperties());
-        for (Map.Entry<String, String> property : secureProperties.entrySet()) {
-            property.setValue(CommonUtils.isEmpty(property.getValue()) ? null : WebConnectionInfo.SECURED_VALUE);
+        DBPPropertyDescriptor[] descriptor = configuration.getHandlerDescriptor().getHandlerProperties();
+        for (DBPPropertyDescriptor p : descriptor) {
+            if (p.hasFeature(RegistryConstants.ATTR_PASSWORD)) {
+                secureProperties.computeIfPresent(p.getId(), (k, v) -> CommonUtils.isEmpty(v) ? null : WebConnectionInfo.SECURED_VALUE);
+            }
         }
         return secureProperties;
     }

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.rm.RMResourceType;
 import org.jkiss.utils.ArrayUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 public class WebProjectInfo {
     private final WebSession session;
@@ -54,11 +53,13 @@ public class WebProjectInfo {
     }
 
     @Property
-    public boolean isGlobal() { return project.getRmProject().isGlobal(); }
+    public boolean isGlobal() {
+        return project.getRMProject().isGlobal();
+    }
 
     @Property
     public boolean isShared() {
-        return project.getRmProject().isShared();
+        return project.getRMProject().isShared();
     }
 
     @Property
@@ -73,7 +74,7 @@ public class WebProjectInfo {
 
     @Property
     public boolean isCanEditDataSources() {
-        if (project.getRmProject().getType() == RMProjectType.USER && !customPrivateConnectionsEnabled) {
+        if (project.getRMProject().getType() == RMProjectType.USER && !customPrivateConnectionsEnabled) {
             return false;
         }
         return hasDataSourcePermission(RMProjectPermission.DATA_SOURCES_EDIT);
@@ -95,12 +96,12 @@ public class WebProjectInfo {
     }
 
     private boolean hasDataSourcePermission(RMProjectPermission permission) {
-        return SMUtils.hasProjectPermission(session, project.getRmProject(), permission);
+        return SMUtils.hasProjectPermission(session, project.getRMProject(), permission);
     }
 
     @Property
     public RMResourceType[] getResourceTypes() {
-        RMResourceType[] resourceTypes = project.getRmProject().getResourceTypes();
+        RMResourceType[] resourceTypes = project.getRMProject().getResourceTypes();
 
         if(resourceTypes == null) {
             return ArrayUtils.toArray(RMResourceType.class, new ArrayList<>());

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package io.cloudbeaver.model;
 
 import io.cloudbeaver.DBWebException;
-import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
+import org.jkiss.dbeaver.model.sql.SQLState;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,22 +28,18 @@ import java.io.StringWriter;
  */
 public class WebServerError {
 
-    private String message;
-    private String stackTrace;
-    private String errorType;
-    private String errorCode;
+    private final String message;
+    private final String stackTrace;
+    private final String errorType;
+    private final String errorCode;
 
     public WebServerError(Throwable ex) {
         this.message = ex.getMessage();
         StringWriter buf = new StringWriter();
         ex.printStackTrace(new PrintWriter(buf, true));
         this.stackTrace = buf.toString();
-        if (ex instanceof DBException) {
-            errorCode = String.valueOf(((DBException) ex).getErrorCode());
-        }
-        if (ex instanceof DBQuotaException) {
-            errorType = DBWebException.ERROR_CODE_QUOTA_EXCEEDED;
-        }
+        errorCode = String.valueOf(SQLState.getCodeFromException(ex));
+        errorType = ex instanceof DBQuotaException ? DBWebException.ERROR_CODE_QUOTA_EXCEEDED : null;
     }
 
     public String getMessage() {

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

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

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

@@ -1,144 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.cloudbeaver.model.app;
-
-import com.google.gson.annotations.Expose;
-import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
-import io.cloudbeaver.registry.WebAuthProviderDescriptor;
-import io.cloudbeaver.registry.WebAuthProviderRegistry;
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
-import org.jkiss.utils.ArrayUtils;
-
-import java.util.*;
-
-public abstract class BaseAuthWebAppConfiguration extends BaseWebAppConfiguration implements WebAuthConfiguration {
-    private String defaultAuthProvider;
-    private String[] enabledAuthProviders;
-    private final Set<SMAuthProviderCustomConfiguration> authConfigurations;
-    // Legacy auth configs, left for backward compatibility
-    @Expose(serialize = false)
-    private final Map<String, SMAuthProviderCustomConfiguration> authConfiguration;
-
-    public BaseAuthWebAppConfiguration() {
-        super();
-        this.defaultAuthProvider = LocalAuthProviderConstants.PROVIDER_ID;
-        this.enabledAuthProviders = null;
-        this.authConfigurations = new LinkedHashSet<>();
-        this.authConfiguration = new LinkedHashMap<>();
-    }
-
-    public BaseAuthWebAppConfiguration(BaseAuthWebAppConfiguration src) {
-        super(src);
-        this.defaultAuthProvider = src.defaultAuthProvider;
-        this.enabledAuthProviders = src.enabledAuthProviders;
-        this.authConfigurations = new LinkedHashSet<>(src.authConfigurations);
-        this.authConfiguration = new LinkedHashMap<>(src.authConfiguration);
-    }
-
-    @Override
-    public String getDefaultAuthProvider() {
-        return defaultAuthProvider;
-    }
-
-    public void setDefaultAuthProvider(String defaultAuthProvider) {
-        this.defaultAuthProvider = defaultAuthProvider;
-    }
-
-    @Override
-    public String[] getEnabledAuthProviders() {
-        if (enabledAuthProviders == null) {
-            // No config - enable all providers (+backward compatibility)
-            return WebAuthProviderRegistry.getInstance().getAuthProviders()
-                .stream().map(WebAuthProviderDescriptor::getId).toArray(String[]::new);
-        }
-        return enabledAuthProviders;
-    }
-
-    public void setEnabledAuthProviders(String[] enabledAuthProviders) {
-        this.enabledAuthProviders = enabledAuthProviders;
-    }
-
-
-    @Override
-    public boolean isAuthProviderEnabled(String id) {
-        var authProviderDescriptor = WebAuthProviderRegistry.getInstance().getAuthProvider(id);
-        if (authProviderDescriptor == null) {
-            return false;
-        }
-
-        if (!ArrayUtils.contains(getEnabledAuthProviders(), id)) {
-            return false;
-        }
-        if (!ArrayUtils.isEmpty(authProviderDescriptor.getRequiredFeatures())) {
-            for (String rf : authProviderDescriptor.getRequiredFeatures()) {
-                if (!isFeatureEnabled(rf)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    ////////////////////////////////////////////
-    // Auth provider configs
-    @Override
-    public Set<SMAuthProviderCustomConfiguration> getAuthCustomConfigurations() {
-        return authConfigurations;
-    }
-
-    @Override
-    @Nullable
-    public SMAuthProviderCustomConfiguration getAuthProviderConfiguration(@NotNull String id) {
-        synchronized (authConfigurations) {
-            return authConfigurations.stream().filter(c -> c.getId().equals(id)).findAny().orElse(null);
-        }
-    }
-
-    public void addAuthProviderConfiguration(@NotNull SMAuthProviderCustomConfiguration config) {
-        synchronized (authConfigurations) {
-            authConfigurations.removeIf(c -> c.getId().equals(config.getId()));
-            authConfigurations.add(config);
-        }
-    }
-
-    public void setAuthProvidersConfigurations(Collection<SMAuthProviderCustomConfiguration> authProviders) {
-        synchronized (authConfigurations) {
-            authConfigurations.clear();
-            authConfigurations.addAll(authProviders);
-        }
-    }
-
-    public boolean deleteAuthProviderConfiguration(@NotNull String id) {
-        synchronized (authConfigurations) {
-            return authConfigurations.removeIf(c -> c.getId().equals(id));
-        }
-    }
-
-    public void loadLegacyCustomConfigs() {
-        // Convert legacy map of configs into list
-        if (!authConfiguration.isEmpty()) {
-            for (Map.Entry<String, SMAuthProviderCustomConfiguration> entry : authConfiguration.entrySet()) {
-                entry.getValue().setId(entry.getKey());
-                authConfigurations.add(entry.getValue());
-            }
-            authConfiguration.clear();
-        }
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.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.model.app;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.jkiss.code.NotNull;
+
+/**
+ * Abstract class that contains methods for loading configuration with gson.
+ */
+public abstract class BaseServerConfigurationController<T extends WebServerConfiguration>
+    implements WebServerConfigurationController<T> {
+
+    @NotNull
+    public Gson getGson() {
+        return getGsonBuilder().create();
+    }
+
+    protected abstract GsonBuilder getGsonBuilder();
+
+    public abstract T getServerConfiguration();
+}

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,16 +29,18 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public static final String DEFAULT_APP_ANONYMOUS_TEAM_NAME = "user";
 
     protected final Map<String, Object> plugins;
-    protected String defaultUserTeam;
+    protected String defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
     protected boolean resourceManagerEnabled;
     protected boolean showReadOnlyConnectionInfo;
     protected String[] enabledFeatures;
+    protected String[] disabledBetaFeatures;
+
 
     public BaseWebAppConfiguration() {
         this.plugins = new LinkedHashMap<>();
-        this.defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
         this.resourceManagerEnabled = true;
         this.enabledFeatures = null;
+        this.disabledBetaFeatures = new String[0];
         this.showReadOnlyConnectionInfo = false;
     }
 
@@ -47,6 +49,7 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
         this.defaultUserTeam = src.defaultUserTeam;
         this.resourceManagerEnabled = src.resourceManagerEnabled;
         this.enabledFeatures = src.enabledFeatures;
+        this.disabledBetaFeatures = src.disabledBetaFeatures;
         this.showReadOnlyConnectionInfo = src.showReadOnlyConnectionInfo;
     }
 
@@ -105,4 +108,8 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public boolean isShowReadOnlyConnectionInfo() {
         return showReadOnlyConnectionInfo;
     }
+
+    public String[] getDisabledBetaFeatures() {
+        return disabledBetaFeatures;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,7 @@
  */
 package io.cloudbeaver.model.app;
 
-import io.cloudbeaver.DataSourceFilter;
-import io.cloudbeaver.WebProjectImpl;
-import io.cloudbeaver.WebSessionProjectImpl;
 import io.cloudbeaver.model.log.SLF4JLogHandler;
-import io.cloudbeaver.model.session.WebSession;
-import io.cloudbeaver.server.WebGlobalWorkspace;
-import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.jkiss.code.NotNull;
@@ -30,16 +24,16 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
-import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
+import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
+import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
-import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.websocket.event.WSEventController;
-import org.jkiss.dbeaver.registry.BaseApplicationImpl;
 import org.jkiss.dbeaver.runtime.IVariableResolver;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -60,14 +54,9 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     public static final String CLI_PARAM_WEB_CONFIG = "-web-config";
     public static final String LOGBACK_FILE_NAME = "logback.xml";
 
-
     private static final Log log = Log.getLog(BaseWebApplication.class);
 
-    @NotNull
-    @Override
-    public DBPWorkspace createWorkspace(@NotNull DBPPlatform platform, @NotNull IWorkspace eclipseWorkspace) {
-        return new WebGlobalWorkspace(platform, eclipseWorkspace);
-    }
+    private String instanceId;
 
     @Override
     public RMController createResourceController(
@@ -99,31 +88,21 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return true;
     }
 
-    @Nullable
-    protected Path loadServerConfiguration() throws DBException {
+    protected boolean loadServerConfiguration() throws DBException {
         Path configFilePath = getMainConfigurationFilePath().toAbsolutePath();
-        Path configFolder = configFilePath.getParent();
 
-        // Configure logging
-        Path logbackConfigPath = getLogbackConfigPath(configFolder);
-
-        if (logbackConfigPath == null) {
-            System.err.println("Can't find slf4j configuration file in " + configFilePath.getParent());
-        } else {
-            System.setProperty("logback.configurationFile", logbackConfigPath.toString());
-        }
         Log.setLogHandler(new SLF4JLogHandler());
 
         // Load config file
         log.debug("Loading configuration from " + configFilePath);
         try {
-            loadConfiguration(configFilePath);
+            getServerConfigurationController().loadServerConfiguration(configFilePath);
         } catch (Exception e) {
             log.error("Error parsing configuration", e);
-            return null;
+            return false;
         }
 
-        return configFilePath;
+        return true;
     }
 
     @Nullable
@@ -142,7 +121,15 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return null;
     }
 
-    private Path getMainConfigurationFilePath() {
+    public Path getLogbackConfigPath() {
+        Path configFilePath = getMainConfigurationFilePath().toAbsolutePath();
+        Path configFolder = configFilePath.getParent();
+
+        // Configure logging
+        return getLogbackConfigPath(configFolder);
+    }
+
+    protected Path getMainConfigurationFilePath() {
         String configPath = DEFAULT_CONFIG_FILE_PATH;
 
         String[] args = Platform.getCommandLineArgs();
@@ -168,37 +155,27 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return Files.exists(customConfigPath) ? customConfigPath : configPath.resolve(fileName);
     }
 
-    protected abstract void loadConfiguration(Path configPath) throws DBException;
-
-    @Override
-    public WebProjectImpl createProjectImpl(
-        @NotNull WebSession webSession,
-        @NotNull RMProject project,
-        @NotNull DataSourceFilter dataSourceFilter
-    ) {
-        return new WebSessionProjectImpl(
-            webSession,
-            project,
-            dataSourceFilter
-        );
-    }
-
     /**
      * There is no secret controller in base web app.
      * Method returns VoidSecretController instance.
      * Advanced apps may implement it differently.
      */
     @Override
-    public DBSSecretController getSecretController(@NotNull SMCredentialsProvider credentialsProvider)  throws DBException {
+    public DBSSecretController getSecretController(
+        @NotNull SMCredentialsProvider credentialsProvider,
+        SMSessionContext smSessionContext
+    ) throws DBException {
         return VoidSecretController.INSTANCE;
     }
 
-    protected Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
+    public static Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
         return JSONUtils.getObject(configProps, "server");
     }
 
     @SuppressWarnings("unchecked")
-    public static void patchConfigurationWithProperties(Map<String, Object> configProps, IVariableResolver varResolver) {
+    public static void patchConfigurationWithProperties(
+        Map<String, Object> configProps, IVariableResolver varResolver
+    ) {
         for (Map.Entry<String, Object> entry : configProps.entrySet()) {
             Object propValue = entry.getValue();
             if (propValue instanceof String) {
@@ -221,6 +198,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
 
     @Override
     public Object start(IApplicationContext context) {
+        initializeApplicationServices();
         try {
             startServer();
         } catch (Exception e) {
@@ -232,14 +210,27 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     protected abstract void startServer() throws DBException;
 
     @Override
-    public String getApplicationInstanceId() throws DBException {
-        try {
-            byte[] macAddress = RuntimeUtils.getLocalMacAddress();
-            String appId = ApplicationRegistry.getInstance().getApplication().getId();
-            return appId + "_" + CommonUtils.toHexString(macAddress) + getServerPort();
-        } catch (Exception e) {
-            throw new DBException("Error during generation instance id generation", e);
+    public synchronized String getApplicationInstanceId() throws DBException {
+        if (instanceId == null) {
+            try {
+                byte[] macAddress = RuntimeUtils.getLocalMacAddress();
+                instanceId = String.join(
+                    "_",
+                    ApplicationRegistry.getInstance().getApplication().getId(),
+                    getWorkspaceIdProperty(), // workspace id is read from property file
+                    CommonUtils.toHexString(macAddress),
+                    CommonUtils.toString(getServerPort())
+                );
+            } catch (Exception e) {
+                throw new DBException("Error during generation instance id generation", e);
+            }
         }
+        return instanceId;
+    }
+
+    @NotNull
+    public String getWorkspaceIdProperty() throws DBException {
+        return BaseWorkspaceImpl.readWorkspaceIdProperty();
     }
 
     public String getApplicationId() {
@@ -255,4 +246,10 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return null;
     }
 
+    public abstract WebServerConfigurationController getServerConfigurationController();
+
+    @Override
+    public boolean isEnvironmentVariablesAccessible() {
+        return false;
+    }
 }