rlwj-lab/aiops
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ws): A3 WebSocket 统一连接管理 — 心跳/注册表/监控/优雅关闭

Browse Source 
- 新增 pkg/wshub/manager.go 统一 WebSocket 连接管理器 (WSManager)
- 6 个 WebSocket handler 全部迁移: WebShell/kubectl/PodExec/Audit/Metrics/Pipeline
- 心跳机制: ping(30s) + pong handler + read deadline(60s) 自动检测死连接
- 连接注册表: 元数据(类型/用户/远程地址/连接时间/最后活跃)
- 每用户连接限制 MaxConnsPerUser=15 防资源耗尽
- 监控端点: GET /api/v1/ws/stats + GET /api/v1/ws/connections
- 优雅关闭: CloseAll() 发送 CloseGoingAway 帧并关闭所有连接
- 消除 3 个重复 websocket.Upgrader 变量统一为 WSManager 内部 upgrader
- 6/6 A3 测试通过, 17/17 回归测试通过
This commit is contained in:
attacker committed 2026-06-27 07:20:11 +08:00
1 parent 00a98e210d
commit e4f1018ca1
13 files changed
+508 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/controller/audit_hub.go
+12 -11
View File
@@ -3,23 +3,26 @@ package controller
import (
"log"
"net/http"
"sync"
"ezops/middleware"
"ezops/pkg/wshub"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
)
// AuditHub 终端审计流中心 — 管理所有活跃会话的审计订阅者
type AuditHub struct {
mu sync.RWMutex
watchers map[uint]map[chan []byte]struct{} // sessionID -> set of watcher channels
wsMgr *wshub.WSManager
}
// NewAuditHub 创建审计 Hub
func NewAuditHub() *AuditHub {
func NewAuditHub(wsMgr *wshub.WSManager) *AuditHub {
return &AuditHub{
watchers: make(map[uint]map[chan []byte]struct{}),
wsMgr: wsMgr,
}
}
@@ -76,20 +79,18 @@ func (h *AuditHub) Cleanup(sessionID uint) {
}
}
var auditUpgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { return true },
ReadBufferSize: 1024,
WriteBufferSize: 1024,
}
// ServeAuditStream 处理 /ws/audit/:sessionId WebSocket — 实时推送终端输出
func (h *AuditHub) ServeAuditStream(c *gin.Context, sessionID uint, historyData string, sessionInfo map[string]interface{}) {
conn, err := auditUpgrader.Upgrade(c.Writer, c.Request, nil)
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
conn, info, err := h.wsMgr.Upgrade(c, wshub.TypeAudit, userID, username)
if err != nil {
log.Printf("[AuditStream] WS 升级失败 session=%d: %v", sessionID, err)
return
}
defer conn.Close()
defer h.wsMgr.Unregister(info)
h.wsMgr.StartHeartbeat(conn, info)
// 发送会话元信息
conn.WriteJSON(map[string]interface{}{
backend/controller/k8s_pod.go
+8 -3
View File
@@ -11,8 +11,10 @@ import (
"strings"
"time"
"ezops/middleware"
"ezops/model"
k8sclient "ezops/pkg/kubernetesclient"
"ezops/pkg/wshub"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
@@ -212,12 +214,15 @@ func (h *KubernetesHandler) ExecTerminal(c *gin.Context) {
}
defer k8sConn.Close()
// Upgrade frontend connection to WebSocket
frontendConn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
// Upgrade frontend connection to WebSocket (tracked by WSManager)
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
frontendConn, info, err := h.wsMgr.Upgrade(c, wshub.TypePodExec, userID, username)
if err != nil {
return
}
defer frontendConn.Close()
defer h.wsMgr.Unregister(info)
h.wsMgr.StartHeartbeat(frontendConn, info)
done := make(chan struct{}, 2)
backend/controller/kubectl_shell.go
+13 -6
View File
@@ -12,8 +12,10 @@ import (
"strconv"
"syscall"
"ezops/middleware"
"ezops/model"
"ezops/pkg/toolinstaller"
"ezops/pkg/wshub"
"github.com/creack/pty"
"github.com/gin-gonic/gin"
@@ -23,13 +25,14 @@ import (
// KubectlShellHandler kubectl WebSocket 终端处理（PTY 模式）
type KubectlShellHandler struct {
db *gorm.DB
toolInstaller *toolinstaller.ToolInstaller
db *gorm.DB
toolInstaller *toolinstaller.ToolInstaller
wsMgr *wshub.WSManager
}
// NewKubectlShellHandler creates handler
func NewKubectlShellHandler(db *gorm.DB, ti *toolinstaller.ToolInstaller) *KubectlShellHandler {
return &KubectlShellHandler{db: db, toolInstaller: ti}
func NewKubectlShellHandler(db *gorm.DB, ti *toolinstaller.ToolInstaller, wsMgr *wshub.WSManager) *KubectlShellHandler {
return &KubectlShellHandler{db: db, toolInstaller: ti, wsMgr: wsMgr}
}
// wsWriter wraps a websocket.Conn as an io.Writer (each write = one WSMessage)
@@ -68,12 +71,16 @@ func (h *KubectlShellHandler) Terminal(c *gin.Context) {
return
}
conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
conn, info, err := h.wsMgr.Upgrade(c, wshub.TypeKubectl, userID, username)
if err != nil {
log.Printf("[KubectlShell] WebSocket upgrade failed: %v", err)
return
}
defer conn.Close()
defer h.wsMgr.Unregister(info)
h.wsMgr.StartHeartbeat(conn, info)
// Write kubeconfig to a temp file (isolated per session)
tmpFile, err := os.CreateTemp("", "kubeconfig-*.yaml")
backend/controller/kubernetes.go
+5 -3
View File
@@ -8,18 +8,20 @@ import (
"ezops/model"
k8sclient "ezops/pkg/kubernetesclient"
"ezops/pkg/wshub"
"github.com/gin-gonic/gin"
)
// KubernetesHandler K8s处理器
type KubernetesHandler struct {
db *gorm.DB
db *gorm.DB
wsMgr *wshub.WSManager
}
// NewKubernetesHandler 创建K8s处理器
func NewKubernetesHandler(db *gorm.DB) *KubernetesHandler {
return &KubernetesHandler{db: db}
func NewKubernetesHandler(db *gorm.DB, wsMgr *wshub.WSManager) *KubernetesHandler {
return &KubernetesHandler{db: db, wsMgr: wsMgr}
}
// ============================================================================
backend/controller/metrics_ws.go
+13 -5
View File
@@ -5,6 +5,9 @@ import (
"log"
"sync"
"ezops/middleware"
"ezops/pkg/wshub"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
)
@@ -85,17 +88,21 @@ func (h *MetricsHub) Broadcast(update MetricsUpdate) {
// MetricsWSHandler 处理 /ws/metrics 的 WebSocket 连接 // Logan.Li
type MetricsWSHandler struct {
hub *MetricsHub
hub *MetricsHub
wsMgr *wshub.WSManager
}
// NewMetricsWSHandler 创建 WebSocket metrics 处理器
func NewMetricsWSHandler(hub *MetricsHub) *MetricsWSHandler {
return &MetricsWSHandler{hub: hub}
func NewMetricsWSHandler(hub *MetricsHub, wsMgr *wshub.WSManager) *MetricsWSHandler {
return &MetricsWSHandler{hub: hub, wsMgr: wsMgr}
}
// ServeWS 升级 HTTP → WebSocket，注册到 Hub，保持连接
func (h *MetricsWSHandler) ServeWS(c *gin.Context) {
conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
conn, info, err := h.wsMgr.Upgrade(c, wshub.TypeMetrics, userID, username)
if err != nil {
log.Printf("[MetricsWS] WebSocket 升级失败: %v", err)
return
@@ -104,8 +111,9 @@ func (h *MetricsWSHandler) ServeWS(c *gin.Context) {
h.hub.Register(conn)
defer func() {
h.hub.Unregister(conn)
conn.Close()
h.wsMgr.Unregister(info)
}()
h.wsMgr.StartHeartbeat(conn, info)
// 保持连接，读取消息（客户端可能发 ping）
for {
backend/controller/webshell.go
+18 -10
View File
@@ -15,9 +15,14 @@ import (
"golang.org/x/crypto/ssh"
"gorm.io/gorm"
"ezops/middleware"
"ezops/model"
"ezops/pkg/wshub"
)
// upgrader is kept for backward compatibility (k8s_pod.go/kubectl_shell.go reference it).
// The WSManager has its own internal upgrader; this global is aliased for handlers
// that haven't been migrated yet or need low-level access.
var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
return true
@@ -87,11 +92,12 @@ func (r *asciicastRecorder) Len() int { return r.buf.Len() }
type WebShellHandler struct {
db *gorm.DB
auditHub *AuditHub
wsMgr *wshub.WSManager
clients sync.Map // sessionID → *SessionContext
}
func NewWebShellHandler(db *gorm.DB, auditHub *AuditHub) *WebShellHandler {
return &WebShellHandler{db: db, auditHub: auditHub}
func NewWebShellHandler(db *gorm.DB, auditHub *AuditHub, wsMgr *wshub.WSManager) *WebShellHandler {
return &WebShellHandler{db: db, auditHub: auditHub, wsMgr: wsMgr}
}
// KillSession 强制终止指定终端会话
@@ -148,21 +154,23 @@ func (h *WebShellHandler) Terminal(c *gin.Context) {
return
}
conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
// Extract user identity BEFORE upgrade (needed for WSManager registration).
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
conn, info, err := h.wsMgr.Upgrade(c, wshub.TypeTerminal, userID, username)
if err != nil {
log.Printf("[WebShell] WS upgrade failed: %v", err)
return
}
defer conn.Close()
defer h.wsMgr.Unregister(info)
h.wsMgr.StartHeartbeat(conn, info)
var userIDPtr *uint
if uid, exists := c.Get("userID"); exists {
if uidVal, ok := uid.(uint); ok {
userIDPtr = &uidVal
}
if userID > 0 {
userIDPtr = &userID
}
username, _ := c.Get("username")
usernameStr, _ := username.(string)
usernameStr := username
termSession := model.TerminalSession{
UserID: userIDPtr,
backend/controller/ws_pipeline_log.go
+11 -8
View File
@@ -8,6 +8,8 @@ import (
"strings"
"time"
"ezops/middleware"
"ezops/pkg/wshub"
ezredis "ezops/pkg/redis"
"github.com/gin-gonic/gin"
@@ -15,19 +17,16 @@ import (
"gorm.io/gorm"
)
var wsUpgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { return true },
}
// WSPipelineLogHandler WebSocket 流水线日志推流
type WSPipelineLogHandler struct {
db *gorm.DB
cache ezredis.Cache
wsMgr *wshub.WSManager
}
// NewWSPipelineLogHandler 创建 WebSocket 日志处理器
func NewWSPipelineLogHandler(db *gorm.DB, cache ezredis.Cache) *WSPipelineLogHandler {
return &WSPipelineLogHandler{db: db, cache: cache}
func NewWSPipelineLogHandler(db *gorm.DB, cache ezredis.Cache, wsMgr *wshub.WSManager) *WSPipelineLogHandler {
return &WSPipelineLogHandler{db: db, cache: cache, wsMgr: wsMgr}
}
// StreamLog WebSocket 端点：/ws/pipeline/:runId/log
@@ -39,11 +38,15 @@ func (h *WSPipelineLogHandler) StreamLog(c *gin.Context) {
return
}
ws, err := wsUpgrader.Upgrade(c.Writer, c.Request, nil)
userID := middleware.GetUserID(c)
username := middleware.GetUsername(c)
ws, info, err := h.wsMgr.Upgrade(c, wshub.TypePipeline, userID, username)
if err != nil {
return
}
defer ws.Close()
defer h.wsMgr.Unregister(info)
h.wsMgr.StartHeartbeat(ws, info)
logKey := fmt.Sprintf("pipeline:run:%d:logs", uint(runID))
ctx := c.Request.Context()