opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#2176 Localhost IP resolve (#2176)

Browse Source 
* dbeaver/pro#2176 Localhost IP resolve

* dbeaver/pro#2176 Localhost name resolve
This commit is contained in:
Serge Rider
2023-12-14 14:04:19 +03:00
committed by GitHub
parent 5779100b9a
commit 91bec0b813
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+6 -4
View File
@@ -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);
}
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
+1
View File
@@ -465,6 +465,7 @@ public class CBDatabase {
} catch (UnknownHostException e) {
hostName = "localhost";
}
byte[] hardwareAddress = RuntimeUtils.getLocalMacAddress();
String macAddress = CommonUtils.toHexString(hardwareAddress);