From 36061a03c4bf0bdde5c341c96f893dae91645281 Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Thu, 7 Dec 2023 12:26:34 +0100 Subject: [PATCH 1/3] CB-4314 add test locale (#2209) Co-authored-by: naumov --- webapp/packages/core-localization/src/locales/en.ts | 1 + webapp/packages/core-localization/src/locales/it.ts | 1 + webapp/packages/core-localization/src/locales/ru.ts | 1 + webapp/packages/core-localization/src/locales/zh.ts | 1 + 4 files changed, 4 insertions(+) diff --git a/webapp/packages/core-localization/src/locales/en.ts b/webapp/packages/core-localization/src/locales/en.ts index c600d1aaa3..74aa073a79 100644 --- a/webapp/packages/core-localization/src/locales/en.ts +++ b/webapp/packages/core-localization/src/locales/en.ts @@ -107,6 +107,7 @@ export default [ ['ui_upload_file_fail', 'Failed to upload file'], ['ui_filter', 'Filter'], ['ui_disable', 'Disable'], + ['ui_test', 'Test'], ['root_permission_denied', "You don't have permissions"], ['root_permission_no_permission', "You don't have permission for this action"], diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts index 438cc03d53..4e8f19f0a4 100644 --- a/webapp/packages/core-localization/src/locales/it.ts +++ b/webapp/packages/core-localization/src/locales/it.ts @@ -91,6 +91,7 @@ export default [ ['ui_upload_file_fail', 'Failed to upload file'], ['ui_filter', 'Filter'], ['ui_disable', 'Disable'], + ['ui_test', 'Test'], ['root_permission_denied', 'Non hai i permessi'], ['app_root_session_expire_warning_title', 'La sessione sta per scadere'], diff --git a/webapp/packages/core-localization/src/locales/ru.ts b/webapp/packages/core-localization/src/locales/ru.ts index 358a6cbf15..79b3ad46f7 100644 --- a/webapp/packages/core-localization/src/locales/ru.ts +++ b/webapp/packages/core-localization/src/locales/ru.ts @@ -103,6 +103,7 @@ export default [ ['ui_upload_file_fail', 'Не удалось загрузить файл'], ['ui_filter', 'Фильтр'], ['ui_disable', 'Отключить'], + ['ui_test', 'Проверить'], ['root_permission_denied', 'Отказано в доступе'], ['root_permission_no_permission', 'У вас нет разрешения на это действие'], diff --git a/webapp/packages/core-localization/src/locales/zh.ts b/webapp/packages/core-localization/src/locales/zh.ts index 7b6344b13f..7b06e38bdf 100644 --- a/webapp/packages/core-localization/src/locales/zh.ts +++ b/webapp/packages/core-localization/src/locales/zh.ts @@ -104,6 +104,7 @@ export default [ ['ui_upload_file_fail', 'Failed to upload file'], ['ui_filter', 'Filter'], ['ui_disable', 'Disable'], + ['ui_test', 'Test'], ['root_permission_denied', '您没有权限'], ['root_permission_no_permission', '您没有权限执行此操作'], From 96a163c50e4777d2bcee4d2386cf61e9cd623ee2 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Fri, 8 Dec 2023 07:47:35 +0300 Subject: [PATCH 2/3] dbeaver/pro#2176 Localhost domain name resolve fix --- .../src/io/cloudbeaver/server/CBApplication.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java index 1490f29247..e6ecc6f754 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java @@ -557,7 +557,12 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut } else if (serverURL == null) { String hostName = serverHost; if (CommonUtils.isEmpty(hostName)) { - hostName = InetAddress.getLocalHost().getHostName(); + try { + hostName = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + log.debug("Error resolving localhost address: " + e.getMessage()); + hostName = "localhost"; + } } serverURL = "http://" + hostName + ":" + serverPort; } @@ -604,7 +609,7 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut } } parseAdditionalConfiguration(configProps); - } catch (IOException | DBException e) { + } catch (DBException e) { throw new DBException("Error parsing server configuration", e); } From 43f50f2ff3bc1ff18b03bc2710fbdbd4607c0dbe Mon Sep 17 00:00:00 2001 From: serge-rider Date: Fri, 8 Dec 2023 13:35:52 +0300 Subject: [PATCH 3/3] dbeaver/pro#2176 Localhost IP resolve fix --- .../io/cloudbeaver/service/security/db/CBDatabase.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java index 778b52cd13..5c7f2933bf 100644 --- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java +++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java @@ -57,6 +57,7 @@ import org.jkiss.utils.SecurityUtils; import java.io.*; import java.net.InetAddress; +import java.net.UnknownHostException; import java.nio.charset.StandardCharsets; import java.sql.*; import java.util.*; @@ -458,8 +459,12 @@ public class CBDatabase { } private void checkInstanceRecord(Connection connection) throws SQLException, IOException { - InetAddress localHost = InetAddress.getLocalHost(); - String hostName = localHost.getHostName(); + String hostName; + try { + hostName = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + hostName = "localhost"; + } byte[] hardwareAddress = RuntimeUtils.getLocalMacAddress(); String macAddress = CommonUtils.toHexString(hardwareAddress);