From 8e237d1bbcdb8515a9e70ebfc1ab0fbc06c99d09 Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Tue, 10 Feb 2026 17:04:22 +0200 Subject: [PATCH] dbeaver/pro#8142 remove public url param (#4119) * dbeaver/pro#8142 remove public url param * dbeaver/pro#8142 remove server url in all products --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../model/app/ServletApplication.java | 3 --- .../cloudbeaver/model/session/WebSession.java | 5 +++++ .../src/io/cloudbeaver/server/CBConstants.java | 1 - .../cloudbeaver/model/CBWebServerConfig.java | 2 +- .../model/config/CBServerConfig.java | 9 --------- .../io/cloudbeaver/server/CBApplication.java | 11 ----------- .../CBServerConfigurationController.java | 18 ------------------ .../server/jetty/CBServerContextListener.java | 1 - .../service/admin/AdminServerConfig.java | 10 ---------- .../service/admin/impl/WebServiceAdmin.java | 2 -- 10 files changed, 6 insertions(+), 56 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletApplication.java index cacc360c94..729cf1cb64 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletApplication.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletApplication.java @@ -80,9 +80,6 @@ public interface ServletApplication extends DBPApplication { @NotNull DBFileController createFileController(@NotNull SMCredentialsProvider credentialsProvider); - @Nullable - String getServerURL(); - @NotNull default String getServicesURI() { return "/"; diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java index cf19260b39..b22a177304 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java @@ -277,6 +277,11 @@ public class WebSession extends BaseWebSession return connectListener; } + @NotNull + public String getClientOrigin() { + return clientOrigin; + } + public void updateClientOrigin(@NotNull String originFromRequest) { this.clientOrigin = originFromRequest; } diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java index df995bfcd5..b9b3ae59cd 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/CBConstants.java @@ -37,7 +37,6 @@ public class CBConstants { public static final String PARAM_SUPPORTED_HOSTS = "supportedHosts"; public static final String PARAM_SSL_CONFIGURATION_PATH = "sslConfigurationPath"; public static final String PARAM_CONTENT_ROOT = "contentRoot"; - public static final String PARAM_SERVER_URL = "serverURL"; public static final String PARAM_ROOT_URI = "rootURI"; public static final String PARAM_SERVICES_URI = "serviceURI"; public static final String PARAM_DRIVERS_LOCATION = "driversLocation"; diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/CBWebServerConfig.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/CBWebServerConfig.java index 38e43a25c8..fff547871d 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/CBWebServerConfig.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/CBWebServerConfig.java @@ -34,7 +34,7 @@ public class CBWebServerConfig extends WebServerConfig { @Property public String getServerURL() { - return CommonUtils.notEmpty(cbApp.getServerConfiguration().getServerURL()); + return ""; // backward compatibility } @Property diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/config/CBServerConfig.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/config/CBServerConfig.java index 66c15ad8bb..176228957e 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/config/CBServerConfig.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/model/config/CBServerConfig.java @@ -31,7 +31,6 @@ public class CBServerConfig implements WebServerConfiguration { private static final Log log = Log.getLog(CBServerConfig.class); - protected String serverURL; @NotNull protected List supportedHosts = new ArrayList<>(); protected boolean forceHttps; @@ -62,10 +61,6 @@ public class CBServerConfig implements WebServerConfiguration { this.securityManagerConfiguration = createSecurityManagerConfiguration(); } - public String getServerURL() { - return serverURL; - } - public int getServerPort() { return serverPort; } @@ -108,10 +103,6 @@ public class CBServerConfig implements WebServerConfiguration { return staticContent; } - public void setServerURL(String serverURL) { - this.serverURL = serverURL; - } - public void setServerPort(int serverPort) { this.serverPort = serverPort; } diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java index 8bc77725e1..7490efc8d5 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java @@ -119,11 +119,6 @@ public abstract class CBApplication this.homeDirectory = new File(initHomeFolder()); } - @Nullable - public String getServerURL() { - return getServerConfiguration().getServerURL(); - } - // Port this server listens on. If set the 0 a random port is assigned which may be obtained with getLocalPort() @Override public int getServerPort() { @@ -259,9 +254,6 @@ public abstract class CBApplication //log.debug("\tProduct details: " + application.getInfoDetails()); log.debug("\tListen port: " + getServerPort() + (CommonUtils.isEmpty(getServerHost()) ? " on all interfaces" : " on " + getServerHost())); log.debug("\tBase URI: " + getServicesURI()); - if (!isConfigurationMode()) { - log.debug("\tGlobal access server URL: " + getServerConfiguration().getServerURL()); - } if (isDevelMode()) { log.debug("\tDevelopment mode"); } else { @@ -356,7 +348,6 @@ public abstract class CBApplication */ protected void performAutoConfiguration(Path configPath) { String autoServerName = System.getenv(CBConstants.VAR_AUTO_CB_SERVER_NAME); - String autoServerURL = System.getenv(CBConstants.VAR_AUTO_CB_SERVER_URL); String autoAdminName = System.getenv(CBConstants.VAR_AUTO_CB_ADMIN_NAME); String autoAdminPassword = System.getenv(CBConstants.VAR_AUTO_CB_ADMIN_PASSWORD); @@ -371,7 +362,6 @@ public abstract class CBApplication autoProps.load(is); autoServerName = autoProps.getProperty(CBConstants.VAR_AUTO_CB_SERVER_NAME); - autoServerURL = autoProps.getProperty(CBConstants.VAR_AUTO_CB_SERVER_URL); autoAdminName = autoProps.getProperty(CBConstants.VAR_AUTO_CB_ADMIN_NAME); autoAdminPassword = autoProps.getProperty(CBConstants.VAR_AUTO_CB_ADMIN_PASSWORD); } catch (IOException e) { @@ -389,7 +379,6 @@ public abstract class CBApplication } CBServerConfig serverConfig = new CBServerConfig(); serverConfig.setServerName(autoServerName); - serverConfig.setServerURL(autoServerURL); serverConfig.setMaxSessionIdleTime(getMaxSessionIdleTime()); try { finishConfiguration( diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBServerConfigurationController.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBServerConfigurationController.java index 338680eff3..87b85abcac 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBServerConfigurationController.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBServerConfigurationController.java @@ -167,14 +167,6 @@ public abstract class CBServerConfigurationController public T parseServerConfiguration() { var config = getServerConfiguration(); - if (config.getServerURL() == null) { - String hostName = config.getServerHost(); - if (CommonUtils.isEmpty(hostName)) { - hostName = getLocalHostAddress(); - } - config.setServerURL("http://" + hostName + ":" + config.getServerPort()); - } - config.setContentRoot(ServletAppUtils.getRelativePath(config.getContentRoot(), homeDirectory)); config.setRootURI(readRootUri(config.getRootURI())); config.setDriversLocation(ServletAppUtils.getRelativePath(config.getDriversLocation(), homeDirectory)); @@ -383,12 +375,6 @@ public abstract class CBServerConfigurationController } } - - public synchronized void updateServerUrl(@NotNull SMCredentialsProvider credentialsProvider, - @Nullable String newPublicUrl) throws DBException { - getServerConfiguration().setServerURL(newPublicUrl); - } - protected Map collectConfigurationProperties( @NotNull CBServerConfig serverConfig, @NotNull CBAppConfig appConfig @@ -523,10 +509,6 @@ public abstract class CBServerConfigurationController CBConstants.PARAM_SERVER_NAME, serverConfig.getServerName()); } - if (!CommonUtils.isEmpty(serverConfig.getServerURL())) { - copyConfigValue( - originServerConfig, serverConfigProperties, CBConstants.PARAM_SERVER_URL, serverConfig.getServerURL()); - } if (serverConfig.getMaxSessionIdleTime() > 0) { copyConfigValue( originServerConfig, diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/jetty/CBServerContextListener.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/jetty/CBServerContextListener.java index af6215b0ff..752b0d09ff 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/jetty/CBServerContextListener.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/jetty/CBServerContextListener.java @@ -39,7 +39,6 @@ public class CBServerContextListener implements ServletContextListener { //scf.setDomain(domain); //scf.setMaxAge(CB_SESSION_LIFE_TIME); cookieConfig.setPath(CBApplication.getInstance().getRootURI()); -// cookieConfig.setSecure(application.getServerURL().startsWith("https")); cookieConfig.setHttpOnly(true); cookieConfig.setName(CBConstants.CB_SESSION_COOKIE_NAME); } diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/AdminServerConfig.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/AdminServerConfig.java index e46498445a..f89f0d3562 100644 --- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/AdminServerConfig.java +++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/AdminServerConfig.java @@ -34,7 +34,6 @@ public class AdminServerConfig { private static final Log log = Log.getLog(AdminServerConfig.class); private String serverName; - private String serverURL; private String adminName; private String adminPassword; @@ -60,7 +59,6 @@ public class AdminServerConfig { public AdminServerConfig(Map params) { this.serverName = JSONUtils.getString(params, "serverName"); - this.serverURL = JSONUtils.getString(params, "serverURL"); this.adminName = JSONUtils.getString(params, "adminName"); this.adminPassword = JSONUtils.getString(params, "adminPassword"); @@ -133,14 +131,6 @@ public class AdminServerConfig { this.serverName = serverName; } - public String getServerURL() { - return serverURL; - } - - public void setServerURL(String serverURL) { - this.serverURL = serverURL; - } - public String getAdminName() { return adminName; } diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java index 5230e78723..bdf8661e28 100644 --- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java +++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java @@ -576,7 +576,6 @@ public class WebServiceAdmin implements DBWServiceAdmin { CBAppConfig appConfig = new CBAppConfig(CBApplication.getInstance().getAppConfiguration()); CBServerConfig serverConfig = new CBServerConfig(); serverConfig.setServerName(CBApplication.getInstance().getServerName()); - serverConfig.setServerURL(CBApplication.getInstance().getServerURL()); serverConfig.setMaxSessionIdleTime(CBApplication.getInstance().getMaxSessionIdleTime()); String adminName = null; String adminPassword = null; @@ -606,7 +605,6 @@ public class WebServiceAdmin implements DBWServiceAdmin { adminName = config.getAdminName(); adminPassword = config.getAdminPassword(); serverConfig.setServerName(config.getServerName()); - serverConfig.setServerURL(config.getServerURL()); serverConfig.setMaxSessionIdleTime(config.getSessionExpireTime()); if (config.getForceHttps() != null) { serverConfig.setForceHttps(config.getForceHttps());