From 91bec0b813fa24f631d4f2c533f79495c997ece6 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Thu, 14 Dec 2023 14:04:19 +0300 Subject: [PATCH] dbeaver/pro#2176 Localhost IP resolve (#2176) * dbeaver/pro#2176 Localhost IP resolve * dbeaver/pro#2176 Localhost name resolve --- .../src/io/cloudbeaver/server/CBApplication.java | 10 ++++++---- .../io/cloudbeaver/service/security/db/CBDatabase.java | 1 + 2 files changed, 7 insertions(+), 4 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 83ea3e8d49..ab4e6c009b 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 @@ -95,6 +95,8 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut * In configuration mode sessions expire after a week */ private static final long CONFIGURATION_MODE_SESSION_IDLE_TIME = 60 * 60 * 1000 * 24 * 7; + public static final String HOST_LOCALHOST = "localhost"; + public static final String HOST_127_0_0_1 = "127.0.0.1"; static { @@ -262,9 +264,9 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut if (CommonUtils.isEmpty(localHostAddress)) { localHostAddress = System.getProperty(CBConstants.VAR_CB_LOCAL_HOST_ADDR); } - if (CommonUtils.isEmpty(localHostAddress) || "127.0.0.1".equals(localHostAddress) || "::0".equals( + if (CommonUtils.isEmpty(localHostAddress) || HOST_127_0_0_1.equals(localHostAddress) || "::0".equals( localHostAddress)) { - localHostAddress = "localhost"; + localHostAddress = HOST_LOCALHOST; } final Runtime runtime = Runtime.getRuntime(); @@ -563,7 +565,7 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut hostName = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { log.debug("Error resolving localhost address: " + e.getMessage()); - hostName = "localhost"; + hostName = HOST_LOCALHOST; } } serverURL = "http://" + hostName + ":" + serverPort; @@ -611,7 +613,7 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut } } parseAdditionalConfiguration(configProps); - } catch (DBException e) { + } catch (Exception e) { throw new DBException("Error parsing server configuration", e); } 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 5c7f2933bf..b02eb0f698 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 @@ -465,6 +465,7 @@ public class CBDatabase { } catch (UnknownHostException e) { hostName = "localhost"; } + byte[] hardwareAddress = RuntimeUtils.getLocalMacAddress(); String macAddress = CommonUtils.toHexString(hardwareAddress);