From 6227e004670cb5e5393c9ff07e65cbf0585f1d8d Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Wed, 24 May 2023 13:03:10 +0200 Subject: [PATCH] CB-3418 fix incorrect session lifetime on easy config (#1686) --- .../src/io/cloudbeaver/model/WebServerConfig.java | 2 +- .../src/io/cloudbeaver/server/CBApplication.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java index 14363cad98..e932737e78 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java @@ -141,7 +141,7 @@ public class WebServerConfig { @Property public long getSessionExpireTime() { - return application.getMaxSessionIdleTime(); + return application.getConfiguredMaxSessionIdleTime(); } @Property 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 8da3b910a8..ef1ca06451 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 @@ -186,6 +186,9 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut return false; } + /** + * @return actual max session idle time + */ public long getMaxSessionIdleTime() { if (isConfigurationMode()) { return CONFIGURATION_MODE_SESSION_IDLE_TIME; @@ -193,6 +196,13 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut return maxSessionIdleTime; } + /** + * @return max session idle time from server configuration, may differ from {@link #getMaxSessionIdleTime()} + */ + public long getConfiguredMaxSessionIdleTime() { + return maxSessionIdleTime; + } + public CBAppConfig getAppConfiguration() { return appConfiguration; }