Merge branch 'devel' into CB-5234-added-aws-auth-in-jwt

SECURITY.md

@@ -9,9 +9,10 @@ currently being supported with security updates.
 | ------- | --------- |
 | 22.x    | yes       |
 | 23.x    | yes       |
+| 24.x    | yes       |
 
 ## Reporting a Vulnerability
 
-Please report (suspected) security vulnerabilities to [email protected].  
-You will receive a response from us within 48 hours.  
-If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days.
+Please report (suspected) security vulnerabilities to [email protected].
+You will receive a response from us within 48 hours.
+If the issue is confirmed, we will release a patch as soon as possible, depending on complexity, but historically, within a few days.

config/GlobalConfiguration/.dbeaver/data-sources.json

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

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

@@ -51,6 +51,7 @@ public Gson getGson() {
         return getGsonBuilder().create();
     }
 
+    @NotNull
     protected abstract GsonBuilder getGsonBuilder();
 
     public abstract T getServerConfiguration();

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java

@@ -19,6 +19,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.InstanceCreator;
+import com.google.gson.Strictness;
 import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.WebNetworkHandlerConfigInput;
 import io.cloudbeaver.model.WebPropertyInfo;
@@ -294,7 +295,7 @@ public static void saveAuthProperties(
                 // Make new Gson parser with type adapters to deserialize into existing credentials
                 InstanceCreator<DBAAuthCredentials> credTypeAdapter = type -> credentials;
                 Gson credGson = new GsonBuilder()
-                    .setLenient()
+                    .setStrictness(Strictness.LENIENT)
                     .registerTypeAdapter(credentials.getClass(), credTypeAdapter)
                     .create();
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java

@@ -16,9 +16,7 @@
  */
 package io.cloudbeaver.server;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.InstanceCreator;
+import com.google.gson.*;
 import io.cloudbeaver.model.app.BaseServerConfigurationController;
 import io.cloudbeaver.model.app.BaseWebApplication;
 import io.cloudbeaver.model.config.CBAppConfig;
@@ -326,6 +324,7 @@ public Map<String, Object> readConfigurationFile(Path path) throws DBException {
         }
     }
 
+    @NotNull
     protected GsonBuilder getGsonBuilder() {
         // Stupid way to populate existing objects but ok google (https://github.com/google/gson/issues/431)
         InstanceCreator<CBAppConfig> appConfigCreator = type -> appConfiguration;
@@ -336,7 +335,8 @@ protected GsonBuilder getGsonBuilder() {
         InstanceCreator<PasswordPolicyConfiguration> smPasswordPoliceConfigCreator =
             type -> securityManagerConfiguration.getPasswordPolicyConfiguration();
         return new GsonBuilder()
-            .setLenient()
+            .setStrictness(Strictness.LENIENT)
+            .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
             .registerTypeAdapter(getServerConfiguration().getClass(), serverConfigCreator)
             .registerTypeAdapter(CBAppConfig.class, appConfigCreator)
             .registerTypeAdapter(DataSourceNavigatorSettings.class, navSettingsCreator)
@@ -372,7 +372,7 @@ private synchronized void writeRuntimeConfig(Path runtimeConfigPath, Map<String,
 
         try (Writer out = new OutputStreamWriter(Files.newOutputStream(runtimeConfigPath), StandardCharsets.UTF_8)) {
             Gson gson = new GsonBuilder()
-                .setLenient()
+                .setStrictness(Strictness.LENIENT)
                 .setPrettyPrinting()
                 .create();
             gson.toJson(configurationProperties, out);

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationControllerEmbedded.java

@@ -92,6 +92,7 @@ private void savePasswordPolicyConfig(Map<String, Object> originServerConfig, Ma
         }
     }
 
+    @NotNull
     @Override
     protected GsonBuilder getGsonBuilder() {
         GsonBuilder gsonBuilder = super.getGsonBuilder();

server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java

@@ -18,6 +18,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.Strictness;
 import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
 import io.cloudbeaver.model.app.WebApplication;
 import io.cloudbeaver.model.config.WebDatabaseConfig;
@@ -301,7 +302,9 @@ CBDatabaseInitialData getInitialData() throws DBException {
         initialDataPath = WebAppUtils.getRelativePath(
             databaseConfiguration.getInitialDataConfiguration(), application.getHomeDirectory());
         try (Reader reader = new InputStreamReader(new FileInputStream(initialDataPath), StandardCharsets.UTF_8)) {
-            Gson gson = new GsonBuilder().setLenient().create();
+            Gson gson = new GsonBuilder()
+                .setStrictness(Strictness.LENIENT)
+                .create();
             return gson.fromJson(reader, CBDatabaseInitialData.class);
         } catch (Exception e) {
             throw new DBException("Error loading initial data configuration", e);

server/drivers/db2-jt400/pom.xml

@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>net.sf.jt400</groupId>
 			<artifactId>jt400</artifactId>
-			<version>10.5</version>
+			<version>20.0.7</version>
 		</dependency>
     </dependencies>
 

server/drivers/mysql/pom.xml

@@ -20,6 +20,10 @@
             <artifactId>mysql-connector-j</artifactId>
             <version>8.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

server/drivers/pom.xml

@@ -1,7 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.cloudbeaver</groupId>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>cloudbeaver</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
     <artifactId>drivers</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>

server/pom.xml

@@ -33,10 +33,10 @@
             <id>full-build</id>
             <activation><property><name>!plain-api-server</name></property></activation>
             <modules>
-                <module>test</module>
                 <module>drivers</module>
                 <!-- Products -->
                 <module>product</module>
+                <module>test</module>
             </modules>
         </profile>
     </profiles>

webapp/package.json

@@ -36,7 +36,7 @@
     "@testing-library/user-event": "^14",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "concurrently": "^8",
+    "concurrently": "^9",
     "husky": "^9",
     "lerna": "^5",
     "mobx": "^6",

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogBody.module.css

@@ -60,7 +60,9 @@
 }
 
 .dialogBodyContent {
+  composes: theme-typography--body1 from global;
   flex: 1;
+  letter-spacing: normal;
   position: relative;
   display: flex;
   flex-direction: column;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogHeader.module.css

@@ -27,6 +27,7 @@
 }
 
 .headerTitle {
+  composes: theme-typography--headline6 from global;
   margin: 0;
   overflow: hidden;
   text-overflow: ellipsis;

webapp/packages/core-blocks/src/ErrorDetailsDialog/ErrorDetailsDialog.tsx

@@ -26,11 +26,12 @@ import { ErrorModel, type IErrorInfo } from './ErrorModel.js';
 
 function DisplayErrorInfo({ error }: { error: IErrorInfo }) {
   const styles = useS(style);
+  const translate = useTranslate();
 
   return (
     <>
       <div className={s(styles, { property: true })}>
-        {error.isHtml ? <Iframe srcDoc={error.message} /> : <div className={s(styles, { message: true })}>{error.message}</div>}
+        {error.isHtml ? <Iframe srcDoc={error.message} /> : <div className={s(styles, { message: true })}>{translate(error.message)}</div>}
       </div>
       {error.stackTrace && (
         <div className={s(styles, { property: true })}>

webapp/packages/core-blocks/src/FormControls/Filter.tsx

@@ -116,7 +116,7 @@ export const Filter = observer<ControlledProps | ObjectsProps<any, any>>(functio
         autoComplete="off"
         className={s(styles, { inputField: true })}
         placeholder={placeholder}
-        disabled={disabled}
+        readOnly={disabled}
         name={name}
         value={value}
         onChange={handleChange}

webapp/packages/core-blocks/src/FormControls/InputField/InputField.module.css

@@ -47,10 +47,8 @@
   align-items: center;
   justify-content: center;
 }
-
 .input[disabled] + .iconContainer {
   cursor: auto;
-  opacity: 0.8;
 }
 .input:not(:only-child) {
   padding-right: 32px !important;

webapp/packages/core-blocks/src/InfoItem.module.css

@@ -10,8 +10,15 @@
   align-items: center;
   flex: 0 0 auto;
 }
+
 .iconOrImage {
   width: 24px;
   height: 24px;
   margin-right: 16px;
+
+  &.compact {
+    width: 18px;
+    height: 18px;
+    margin-right: 8px;
+  }
 }

webapp/packages/core-blocks/src/InfoItem.tsx

@@ -18,19 +18,20 @@ import { useS } from './useS.js';
 export interface IInfoItem {
   info: TLocalizationToken;
   icon?: string;
+  compact?: boolean;
 }
 
 interface Props extends IInfoItem {
   className?: string;
 }
 
-export const InfoItem = observer<Props>(function InfoItem({ info, icon = '/icons/info_icon.svg', className }) {
+export const InfoItem = observer<Props>(function InfoItem({ info, compact, icon = '/icons/info_icon.svg', className }) {
   const styles = useS(style);
 
   const translate = useTranslate();
   return (
     <div className={s(styles, { infoItem: true }, className)}>
-      <IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} />
+      <IconOrImage className={s(styles, { iconOrImage: true, compact })} icon={icon} />
       {translate(info)}
     </div>
   );

webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx

@@ -221,8 +221,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         placeholder={passwordSavedMessage}
         name={property.id!}
         value={value}
-        disabled={disabled}
-        readOnly={readOnly}
+        readOnly={readOnly || disabled}
         className={className}
       >
         {property.displayName ?? ''}
@@ -243,8 +242,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
         autoHide={autoHide}
         description={property.hint}
         placeholder={passwordSavedMessage}
-        disabled={disabled}
-        readOnly={readOnly}
+        readOnly={readOnly || disabled}
         autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
         className={className}
         canShowPassword={canShowPassword}
@@ -266,8 +264,7 @@ export const RenderField = observer<RenderFieldProps>(function RenderField({
       defaultValue={defaultValue}
       description={property.hint}
       placeholder={passwordSavedMessage}
-      disabled={disabled}
-      readOnly={readOnly}
+      readOnly={readOnly || disabled}
       autoComplete={RESERVED_KEYWORDS.includes(autofillToken) ? autofillToken : `${autofillToken} ${property.id}`}
       className={className}
       canShowPassword={canShowPassword}

webapp/packages/core-blocks/src/StatusMessage.module.css

@@ -8,11 +8,14 @@
 .statusMessage {
   overflow: hidden;
   composes: theme-typography--caption from global;
-  height: 24px;
   display: flex;
   align-items: center;
   gap: 8px;
 }
+
+.statusMessageExtended {
+  height: 24px;
+}
 .iconOrImage {
   height: 24px;
   width: 24px;

webapp/packages/core-blocks/src/StatusMessage.tsx

@@ -22,10 +22,18 @@ interface Props {
   type?: ENotificationType | null;
   exception?: Error | null;
   className?: string;
+  multipleRows?: boolean;
   onShowDetails?: () => void;
 }
 
-export const StatusMessage = observer<Props>(function StatusMessage({ type, message, exception = null, className, onShowDetails }) {
+export const StatusMessage = observer<Props>(function StatusMessage({
+  type,
+  multipleRows = false,
+  message,
+  exception = null,
+  className,
+  onShowDetails,
+}) {
   const styles = useS(style);
   const translate = useTranslate();
   const errorDetails = useErrorDetails(exception);
@@ -51,13 +59,13 @@ export const StatusMessage = observer<Props>(function StatusMessage({ type, mess
   }
 
   return (
-    <div className={s(styles, { statusMessage: true }, className)}>
+    <div className={s(styles, { statusMessage: true, statusMessageExtended: !multipleRows }, className)}>
       {message && (
         <>
           <IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} />
-          <div className={s(styles, { message: true })} title={message}>
+          <div className={s(styles, { message: !multipleRows })} title={message}>
             {onShowDetails ? (
-              <Link className={s(styles, { link: true })} onClick={onShowDetails}>
+              <Link className={s(styles, { link: !multipleRows })} onClick={onShowDetails}>
                 {message}
               </Link>
             ) : (

webapp/packages/core-blocks/src/index.ts

@@ -10,6 +10,7 @@ export * from './CommonDialog/CommonDialog/CommonDialogFooter.js';
 export * from './CommonDialog/CommonDialog/CommonDialogHeader.js';
 export * from './CommonDialog/CommonDialog/CommonDialogWrapper.js';
 export * from './CommonDialog/ConfirmationDialog.js';
+export { default as ConfirmationDialogStyles } from './CommonDialog/ConfirmationDialog.module.css';
 export * from './CommonDialog/ConfirmationDialogDelete.js';
 export * from './CommonDialog/RenameDialog.js';
 export * from './CommonDialog/DialogsPortal.js';

webapp/packages/core-connections/src/locales/de.ts

@@ -58,4 +58,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];

webapp/packages/core-connections/src/locales/en.ts

@@ -102,4 +102,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];

webapp/packages/core-connections/src/locales/fr.ts

@@ -111,4 +111,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];

webapp/packages/core-connections/src/locales/it.ts

@@ -100,4 +100,5 @@ export default [
 
   ['core_connections_settings_disable', 'Disable'],
   ['core_connections_settings_disable_description', 'Disable the ability to create new connections'],
+  ['connections_templates_deprecated_message', 'Template connections are deprecated and will be removed in future releases'],
 ];

webapp/packages/core-connections/src/locales/ru.ts

@@ -103,4 +103,5 @@ export default [
 
   ['core_connections_settings_disable', 'Отключить'],
   ['core_connections_settings_disable_description', 'Отключить возможность создания новых подключений'],
+  ['connections_templates_deprecated_message', 'Шаблоны подключений больше не поддерживаются и будут удалены в будущих релизах'],
 ];