Merge pull request #129 from jumpserver/dev

v4.10.8-lts

Author: baijiangjie

backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java

@@ -13,11 +13,16 @@
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.Locale;
 import java.util.Map;
 
 public interface Session {
 
+    void refreshLastActiveTime();
+
+    LocalDateTime getLastActiveTime();
+
     boolean canUpload();
 
     boolean canDownload();

backend/framework/src/main/java/org/jumpserver/chen/framework/session/controller/impl/BaseController.java

@@ -1,6 +1,7 @@
 package org.jumpserver.chen.framework.session.controller.impl;
 
 import lombok.extern.slf4j.Slf4j;
+import org.jumpserver.chen.framework.session.SessionManager;
 import org.jumpserver.chen.framework.session.controller.Controller;
 import org.jumpserver.chen.framework.session.controller.dialog.Dialog;
 import org.jumpserver.chen.framework.session.controller.message.Message;
@@ -40,11 +41,20 @@ public void handlePacket(Packet packet) {
             case "dialog_event":
                 this.onDialogEvent((String) packet.getData());
                 break;
+            case "input_active":
+                this.refreshLastActiveTime();
+                break;
             default:
                 break;
         }
     }
 
+
+    private void refreshLastActiveTime() {
+        var session = SessionManager.getCurrentSession();
+        session.refreshLastActiveTime();
+    }
+
     @Override
     public void sendFile(String fileKey) {
         this.packetIO.sendPacket("download", fileKey);

backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java

@@ -21,6 +21,7 @@
 import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -57,13 +58,21 @@ public class BaseSession implements Session {
 
     private boolean enableAutoComplete = true;
 
+    @Getter
+    private LocalDateTime lastActiveTime;
+
 
     public BaseSession(Datasource datasource, String remoteAddr) {
         this.datasource = datasource;
         this.remoteAddr = remoteAddr;
     }
 
 
+    @Override
+    public void refreshLastActiveTime() {
+        this.lastActiveTime = LocalDateTime.now();
+    }
+
     @Override
     public boolean canUpload() {
         return true;

backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java

@@ -51,8 +51,6 @@ public class JMSSession extends BaseSession {
     private final long expireTime;
 
 
-    private LocalDateTime lastActiveTime;
-
     private LocalDateTime maxSessionEndTime;
     private int maxSessionEndHours;
     private LocalDateTime dynamicEndTime;
@@ -205,7 +203,7 @@ private void recordLifecycle(ServiceOuterClass.SessionLifecycleLogRequest.EventT
     }
 
     private void startWaitIdleTime() {
-        this.lastActiveTime = LocalDateTime.now();
+        this.refreshLastActiveTime();
 
         var token = SessionManager.getContextToken();
 
@@ -224,7 +222,7 @@ private void startWaitIdleTime() {
                             return;
                         }
 
-                        if (Math.abs(Duration.between(LocalDateTime.now(), this.lastActiveTime).toMinutes()) > this.maxIdleTimeDelta) {
+                        if (Math.abs(Duration.between(LocalDateTime.now(), this.getLastActiveTime()).toMinutes()) > this.maxIdleTimeDelta) {
                             this.close("OverMaxIdleTimeError", "idle_disconnect", this.maxIdleTimeDelta);
                             return;
                         }
@@ -310,7 +308,7 @@ private void closeGateway() {
     @Override
     public SQLQueryResult withAudit(String command, QueryAuditFunction queryAuditFunction) throws SQLException, CommandRejectException {
         synchronized (this) {
-            this.lastActiveTime = LocalDateTime.now();
+            this.refreshLastActiveTime();
         }
         if (this.locked) {
             throw new CommandRejectException(MessageUtils.get("SessionLockedError"));

backend/modules/src/main/java/org.jumpserver.chen.modules/base/ssl/SSLCertManager.java

@@ -1,6 +1,7 @@
 package org.jumpserver.chen.modules.base.ssl;
 
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -27,6 +28,10 @@ public class SSLCertManager {
 
     // 获取 CA 证书的路径
     public String getCaCertPath() throws IOException {
+        if (StringUtils.isEmpty(caCert)) {
+            return null;
+        }
+
         if (caCertFile == null) {
             caCertFile = createTempFile("ca-cert", caCert);
         }
@@ -35,6 +40,10 @@ public String getCaCertPath() throws IOException {
 
     // 获取客户端私钥的路径，并将 PEM 格式的私钥转换为 DER 格式
     public String getClientCertKeyPath() throws Exception {
+        if (StringUtils.isEmpty(clientCertKey)) {
+            return null;
+        }
+
         if (clientCertKeyFile == null) {
             // 检查 clientCertKey 是否是 PEM 格式并转换为 DER
             clientCertKeyFile = createTempFile("client-cert-key", convertPEMToDER(clientCertKey));
@@ -44,6 +53,11 @@ public String getClientCertKeyPath() throws Exception {
 
     // 获取客户端证书的路径
     public String getClientCertPath() throws IOException {
+
+        if (StringUtils.isEmpty(clientCert)) {
+            return null;
+        }
+
         if (clientCertFile == null) {
             clientCertFile = createTempFile("client-cert", clientCert);
         }

backend/modules/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java

@@ -1,5 +1,6 @@
 package org.jumpserver.chen.modules.postgresql;
 
+import org.apache.commons.lang3.StringUtils;
 import org.jumpserver.chen.framework.datasource.Datasource;
 import org.jumpserver.chen.framework.datasource.base.BaseConnectionManager;
 import org.jumpserver.chen.framework.datasource.entity.DBConnectInfo;
@@ -48,11 +49,24 @@ protected void setSSLProps(Properties props) {
 
 
             try {
+                var sslCaCertPath = sslManager.getCaCertPath();
+                var sslClientCertPath = sslManager.getClientCertPath();
+                var sslClientCertKeyPath = sslManager.getClientCertKeyPath();
+
                 props.setProperty("ssl", "true");
                 props.setProperty("sslmode", sslMode);
-                props.setProperty("sslrootcert", sslManager.getCaCertPath());
-                props.setProperty("sslcert", sslManager.getClientCertPath());
-                props.setProperty("sslkey", sslManager.getClientCertKeyPath());
+
+                if (StringUtils.isNotEmpty(sslCaCertPath)) {
+                    props.setProperty("sslrootcert", sslManager.getCaCertPath());
+                }
+
+                if (StringUtils.isNotEmpty(sslClientCertPath)) {
+                    props.setProperty("sslcert", sslManager.getClientCertPath());
+                }
+
+                if (StringUtils.isNotEmpty(sslClientCertKeyPath)) {
+                    props.setProperty("sslkey", sslManager.getClientCertKeyPath());
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

backend/web/src/main/java/org/jumpserver/chen/web/config/WebSocketConfig.java

@@ -3,6 +3,7 @@
 import org.jumpserver.chen.framework.ws.ConsoleWebSocketHandler;
 import org.jumpserver.chen.framework.ws.DBConsoleWebsocketHandler;
 import org.jumpserver.chen.framework.ws.SessionWebSocketHandler;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
@@ -11,13 +12,27 @@
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 import org.springframework.web.socket.server.HandshakeInterceptor;
+import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
 
 import java.util.Map;
 import java.util.Objects;
 
 @Configuration
 @EnableWebSocket
 public class WebSocketConfig implements WebSocketConfigurer {
+
+
+    @Bean
+    public ServletServerContainerFactoryBean createWebSocketContainer() {
+        ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
+        container.setMaxTextMessageBufferSize(20 * 1024 * 1024);
+        container.setMaxBinaryMessageBufferSize(20 * 1024 * 1024);
+        // 可选：异步发送超时
+        // container.setAsyncSendTimeout(20_000L);
+        return container;
+    }
+
+
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry

frontend/src/bus/index.js

@@ -0,0 +1,3 @@
+import Vue from 'vue'
+
+export const bus = new Vue()

frontend/src/components/Controller/index.vue

@@ -5,12 +5,13 @@
     :show-close="dialogOptions.showClose"
     :close-on-click-modal="false"
     :visible.sync="dialogVisible"
+    :modal="false"
   >
     <div
       v-if="dialogOptions.body && dialogOptions.bodyType==='html'"
       v-html="dialogOptions.body"
     />
-    <div v-else v-text="dialogOptions.body" />
+    <div v-else v-text="dialogOptions.body"/>
 
     <span v-if="dialogOptions && dialogOptions.buttons" slot="footer" class="dialog-footer" style="text-align: center">
       <el-button
@@ -26,6 +27,7 @@
 import { getUrlParams } from '@/utils/field'
 import { LunaEvent, MESSAGES } from '@/utils/luna'
 import { index } from '@/request'
+import { bus } from '@/bus'
 
 export default {
   name: 'Controller',
@@ -48,8 +50,20 @@ export default {
     this.lunaEvent.init()
     this.auth()
     this.handleRenewLunaSession()
+    this.handleInputActive()
   },
   methods: {
+    handleInputActive() {
+      bus.$on('input-active', () => {
+        this.lunaEvent.sendEventToLuna(MESSAGES.INPUT_ACTIVE)
+      })
+
+      this.lunaEvent.setInputActiveHandler(() => {
+        console.log('receive other window input active message')
+        this.sendPacket('input_active')
+      })
+    },
+
     handleRenewLunaSession() {
       const lunaEvent = this.lunaEvent
 

frontend/src/components/Main/Explore/DataView/ExportDataDialog.vue

@@ -3,6 +3,7 @@
     v-if="visible"
     :title="$tc('ExportData')"
     :visible.sync="iVisible"
+    :modal="false"
     width="40%"
   >
     <el-form ref="form" :model="form" label-width="80px">