Merge remote-tracking branch 'origin/devel' into CB-4280-refactor-cb-…

…application-configuration-logic

# Conflicts:
#	server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
#	server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java

.vscode/launch.json

@@ -30,7 +30,7 @@
         "request": "launch",
         "mainClass": "org.eclipse.equinox.launcher.Main",
         "classPaths": [
-          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar"
+          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
         ],
         "args": [
           "-product",
@@ -65,7 +65,7 @@
         "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"
+          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
         ],
         "args": [
           "-product",

.vscode/license.code-snippets

@@ -5,7 +5,7 @@
     "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

@@ -50,6 +50,19 @@
         "isDefault": true
       }
     },
+    {
+      "label": "Run Backend CE",
+      "type": "shell",
+      "windows": {
+        "command": "./run-server.bat"
+      },
+      "osx": {
+        "command": "./run-server.sh"
+      },
+      "options": {
+        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
+      }
+    },
     {
       "label": "Yarn Install",
       "type": "shell",
@@ -60,6 +73,14 @@
         "close": true,
         "clear": false
       }
+    },
+    {
+      "label": "Update TS references CE",
+      "type": "shell",
+      "command": "yarn lerna run update-ts-references --stream",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp"
+      }
     }
   ],
   "inputs": [

README.md

@@ -22,32 +22,28 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 
 ## Changelog
 
-### Changes since 23.2.0: 
-
-- Security:
-   - Unauthorized access vulnerability was fixed;
-   - All embedded drivers are disabled by default. Administrators can re-enable them in the Server configuration.
-- Access Management:
-   - Administrators have gained the ability to permanently delete users and their data.
-- Authorization:
-   - The SSL option is available for establishing a connection in SQL Server.
-- Connections:
-   - The 'Save credentials' checkbox has been removed from a template creating form as credentials are not stored in templates.
-- SQL Editor:
-   - Support for using custom delimiters has been added in MySQL;
-   - The Output tab has been implemented, which includes warnings, info, and notices generated by the database when executing user queries;
-   - Fixed an issue in the SQL editor where it was impossible to switch the active schema when working with Oracle databases;
-   - Added ability to select shared connections for private scripts;
-   - Private connections can be chosen for shared scripts, but this change won’t be saved to the script file.
-- Data Editor:
-   - Scrollbars have been made theme-independent;
-   - Added the ability to edit binary values in a table;
-   - Added the ability to count the total number of entries in the table.
-- Driver management:
-   - Updated the version of the Clickhouse driver to 0.4.6.
-- Many small bug fixes, enhancements, and improvements have been made
-
-### Old CloudBeaver releases
-
-You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
-
+### 23.3.5. 2024-02-19
+- Default user group was added to the product. This group includes all users. You cannot delete users from this group;
+- Added the ability to disable alias autocomplete for all users in the admin panel;
+- Different bug fixes and enhancements have been made.
+
+### 23.3.4. 2024-02-05
+- Text wrap is activated by default for texts and BLOBs in the Values panel for better visibility. User can switch to the one-line mode using a button on the toolbar;
+- Added the ability to edit the default preferences of the following parts: interface, tools and data viewer in the settings panel in the administrative part;
+- Added ability to configure reverse proxy header name and redirect URL at logout. Admin will now be able to configure all settings;
+- Update PostgreSQL driver to 42.5.2;
+- Added the ability to display the OpenStreetMap layer with the default coordinate system ESPG 4326;
+- ClickHouse Legacy driver has been removed to prevent potential vulnerability issues;
+- Different bug fixes and enhancements have been made.
+
+### 23.3.3. 2024-01-22
+- Added password policy for the local authorization. Password parameters can be set in the configuration file;
+- The 'Keep alive' option has been added to the connection settings to keep the connection active even in case of inactivity;
+- Added ability to display full text for a string data type in value panel;
+- The DuckDB driver has been added;
+- Different bug fixes and enhancements have been made.
+
+### 23.3.2. 2024-01-08
+- Added the ability to view decoded binary-type data in the Value panel;
+- Enhanced security for unauthorized access;
+- Different bug fixes and enhancements have been made.

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

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

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

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

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

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

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

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

config/core/initial-data.conf

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

config/core/product.conf

@@ -27,5 +27,6 @@
     },
     plugin_data_export: {
         disabled: false
-    }
+    },
+    sql.proposals.insert.table.alias: true
 }

config/sample-databases/DefaultConfiguration/cloudbeaver.conf

@@ -19,6 +19,19 @@
 
         enableSecurityManager: false,
 
+        sm: {
+            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
+            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
+            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
+            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
+            passwordPolicy: {
+                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
+                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
+                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
+                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
+            }
+        },
+
         database: {
             driver="h2_embedded_v2",
             url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",

config/sample-databases/SQLiteConfiguration/cloudbeaver.conf

@@ -27,6 +27,18 @@
                 maxConnections: 100,
                 validationQuery: "SELECT 1"
             }
+        },
+        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}"
+            }
         }
 
     },

deploy/build-backend.sh

@@ -23,7 +23,9 @@ echo "Pull cloudbeaver platform"
 cd ../..
 
 echo "Pull dbeaver platform"
-[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git
+[ ! -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
 

deploy/build.bat

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

deploy/docker/Dockerfile

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

javaConfig.json

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

project.deps

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

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

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.43.qualifier
-Bundle-Release-Date: 20231225
+Bundle-Version: 1.0.48.qualifier
+Bundle-Release-Date: 20240304
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -33,6 +33,7 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.model.rm.lock,
  io.cloudbeaver.model.session,
  io.cloudbeaver.model.user,
+ io.cloudbeaver.model.utils,
  io.cloudbeaver.registry,
  io.cloudbeaver.server,
  io.cloudbeaver.service,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.

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.