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#7767 Add cookie-based session support (#3975)

Browse Source
This commit is contained in:
Viktor Kirst
2025-12-12 11:13:00 +00:00
committed by GitHub
parent 5d2c6dc062
commit dc97f315ab
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBEventsLongPollingServlet.java
+36 -3
View File
@@ -24,6 +24,7 @@ import io.cloudbeaver.server.WebAppSessionManager;
import io.cloudbeaver.server.WebAppUtils;
import io.cloudbeaver.utils.ServletAppUtils;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -40,6 +41,7 @@ import org.jkiss.dbeaver.model.websocket.event.session.WSSocketConnectedEvent;
import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.HttpConstants;
import org.jkiss.utils.rest.RpcConstants;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -104,12 +106,13 @@ public class CBEventsLongPollingServlet extends HttpServlet {
BaseWebSession ws = resolveSession(req);
resp.setHeader(WSConstants.WS_SESSION_HEADER, ws.getSessionId());
resp.addCookie(new Cookie(CBConstants.CB_SESSION_COOKIE_NAME, ws.getSessionId()));
CBEventsLongPolling ps = getOrCreatePollSession(ws);
String json = new String(req.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
if (CommonUtils.isEmpty(json)) {
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Empty payload");
sendError(resp, HttpServletResponse.SC_BAD_REQUEST, "Empty payload");
return;
}
@@ -202,9 +205,21 @@ public class CBEventsLongPollingServlet extends HttpServlet {
@Nullable
private String getSessionId(@NotNull HttpServletRequest req) {
return req.getHeader(WSConstants.WS_SESSION_HEADER);
}
String sid = req.getHeader(WSConstants.WS_SESSION_HEADER);
if (!CommonUtils.isEmpty(sid)) {
return sid;
}
if (req.getCookies() != null) {
for (var cookie : req.getCookies()) {
if (CBConstants.CB_SESSION_COOKIE_NAME.equals(cookie.getName())) {
return cookie.getValue();
}
}
}
return null;
}
@NotNull
private CBEventsLongPolling getOrCreatePollSession(@NotNull BaseWebSession ws) {
@@ -225,4 +240,22 @@ public class CBEventsLongPollingServlet extends HttpServlet {
});
}
public static void sendError(
@NotNull HttpServletResponse resp,
int status,
@NotNull String message
) throws IOException {
resp.setStatus(status);
resp.setContentType(CBConstants.APPLICATION_JSON);
Map<String, Object> error = Map.of(
"error", message,
"status", status
);
RpcConstants.COMPACT_GSON.toJson(error, resp.getWriter());
}
}