dbeaver-vscode# jetty 12 conflict fixes

dbeaver · Sep 17, 2024 · 6c8acb8 · 6c8acb8
1 parent a3bcca6
commit 6c8acb8
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 26 deletions.
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
@@ -27,6 +27,7 @@
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.WebServerMessage;
 import io.cloudbeaver.model.app.WebApplication;
+import io.cloudbeaver.model.app.WebAuthApplication;
 import io.cloudbeaver.model.user.WebUser;
 import io.cloudbeaver.service.DBWSessionHandler;
 import io.cloudbeaver.service.sql.WebSQLConstants;
@@ -126,17 +127,19 @@ public class WebSession extends BaseWebSession
     public WebSession(
         @NotNull WebHttpRequestInfo requestInfo,
         @NotNull WebAuthApplication application,
-        @NotNull HttpServletRequest request,
-        @NotNull WebApplication application,
         @NotNull Map<String, DBWSessionHandler> sessionHandlers
     ) throws DBException {
-        this(
-            request.getSession().getId(),
-            CommonUtils.toString(request.getSession().getAttribute(ATTR_LOCALE), null),
-            application,
-            sessionHandlers
-        );
-        updateSessionParameters(request);
+        super(requestInfo.getId(), application);
+        this.lastAccessTime = this.createTime;
+        setLocale(CommonUtils.toString(requestInfo.getLocale(), this.locale));
+        this.sessionHandlers = sessionHandlers;
+        //force authorization of anonymous session to avoid access error,
+        //because before authorization could be called by any request,
+        //but now 'updateInfo' is called only in special requests,
+        //and the order of requests is not guaranteed.
+        //look at CB-4747
+        refreshSessionAuth();
+        updateSessionParameters(requestInfo);
     }
 
     protected WebSession(
@@ -145,10 +148,8 @@ protected WebSession(
         @NotNull WebApplication application,
         @NotNull Map<String, DBWSessionHandler> sessionHandlers
     ) throws DBException {
-        super(requestInfo.getId(), application);
         super(id, application);
         this.lastAccessTime = this.createTime;
-        setLocale(CommonUtils.toString(requestInfo.getLocale(), this.locale));
         this.sessionHandlers = sessionHandlers;
         setLocale(locale);
         //force authorization of anonymous session to avoid access error,
@@ -157,7 +158,6 @@ protected WebSession(
         //and the order of requests is not guaranteed.
         //look at CB-4747
         refreshSessionAuth();
-        updateSessionParameters(requestInfo);
     }
 
     @Nullable

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/AppWebSessionManager.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/AppWebSessionManager.java
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.model.app;
+package io.cloudbeaver.server;
 
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebHeadlessSession;
 import io.cloudbeaver.model.session.WebSession;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Session;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -54,7 +56,7 @@ WebSession getWebSession(
 
     Collection<BaseWebSession> getAllActiveSessions();
 
-    WebSession getOrRestoreSession(HttpServletRequest httpRequest);
+    WebSession getOrRestoreSession(Request httpRequest);
 
     WebHeadlessSession getHeadlessSession(Request request, Session session, boolean create) throws DBException;
 

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
@@ -19,7 +19,6 @@
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.auth.NoAuthCredentialsProvider;
 import io.cloudbeaver.model.app.BaseWebApplication;
-import io.cloudbeaver.model.app.GQLApplicationAdapter;
 import io.cloudbeaver.model.app.WebAuthApplication;
 import io.cloudbeaver.model.app.WebAuthConfiguration;
 import io.cloudbeaver.registry.WebDriverRegistry;

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -18,8 +18,6 @@
 package io.cloudbeaver.server;
 
 import io.cloudbeaver.auth.NoAuthCredentialsProvider;
-import io.cloudbeaver.model.app.AppWebSessionManager;
-import io.cloudbeaver.model.app.GQLApplicationAdapter;
 import io.cloudbeaver.server.jobs.SessionStateJob;
 import io.cloudbeaver.server.jobs.WebDataSourceMonitorJob;
 import io.cloudbeaver.server.jobs.WebSessionMonitorJob;

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/GQLApplicationAdapter.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/GQLApplicationAdapter.java
@@ -14,8 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cloudbeaver.model.app;
+package io.cloudbeaver.server;
 
+import io.cloudbeaver.model.app.WebApplication;
 import io.cloudbeaver.registry.WebDriverRegistry;
 import org.jkiss.code.NotNull;
 

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.server.jetty;
 
-import io.cloudbeaver.model.app.GQLApplicationAdapter;
+import io.cloudbeaver.server.GQLApplicationAdapter;
 import io.cloudbeaver.registry.WebServiceRegistry;
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBServerConfig;
@@ -137,7 +137,12 @@ public void runServer() {
                 );
                 servletContextHandler.insertHandler(webSocketHandler);
 
-                initSessionManager(this.application, server, servletContextHandler);
+                initSessionManager(
+                    this.application.getMaxSessionIdleTime(),
+                    this.application,
+                    server,
+                    servletContextHandler
+                );
 
                 server.setHandler(servletContextHandler);
 
@@ -192,8 +197,7 @@ public static void initSessionManager(
         @NotNull ServletContextHandler servletContextHandler
     ) {
         // Init sessions persistence
-        SessionHandler sessionHandler = new SessionHandler();
-        var maxIdleTime = application.getMaxSessionIdleTime();
+        CBSessionHandler sessionHandler = new CBSessionHandler(application);
         int intMaxIdleSeconds;
         if (maxIdleTime > Integer.MAX_VALUE) {
             log.warn("Max session idle time value is greater than Integer.MAX_VALUE. Integer.MAX_VALUE will be used instead");

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBSessionHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBSessionHandler.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.server.jetty;
 
-import io.cloudbeaver.model.app.GQLApplicationAdapter;
+import io.cloudbeaver.server.GQLApplicationAdapter;
 import jakarta.servlet.SessionCookieConfig;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.SessionHandler;

diff --git a/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java b/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java
@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.server.jobs;
 
-import io.cloudbeaver.model.app.AppWebSessionManager;
+import io.cloudbeaver.server.AppWebSessionManager;
 import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;

diff --git a/...s/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBJettyWebSocketManager.java b/...s/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBJettyWebSocketManager.java
@@ -16,12 +16,11 @@
  */
 package io.cloudbeaver.server.websockets;
 
-import io.cloudbeaver.model.app.AppWebSessionManager;
+import io.cloudbeaver.server.AppWebSessionManager;
 import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebHeadlessSession;
 import io.cloudbeaver.model.session.WebHttpRequestInfo;
 import io.cloudbeaver.server.CBPlatform;
-import io.cloudbeaver.service.session.WebSessionManager;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.server.ServerUpgradeRequest;

diff --git a/...r/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/session/WebSessionManager.java b/...r/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/session/WebSessionManager.java
@@ -18,6 +18,7 @@
 
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.auth.SMTokenCredentialProvider;
+import io.cloudbeaver.server.AppWebSessionManager;
 import io.cloudbeaver.model.session.*;
 import io.cloudbeaver.registry.WebHandlerRegistry;
 import io.cloudbeaver.registry.WebSessionHandlerDescriptor;