Skip to content

fix: concurrent write to websocket connection panic #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions pkg/wsproxy/websocket_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package wsproxy
import (
"bufio"
"bytes"
"errors"
"io"
"net"
"net/http"
"strings"
"sync"
"time"

"github.com/gorilla/websocket"
Expand Down Expand Up @@ -170,24 +172,25 @@ func (p *Proxy) proxy(w http.ResponseWriter, r *http.Request) {
p.timeWait = timeWait
}

conn, err := upgrade.Upgrade(w, r, responseHeader)
conn1, err := upgrade.Upgrade(w, r, responseHeader)
if err != nil {
log.Warn().Err(err).Msg("error upgrading websocket")
return
}
defer conn.Close()
defer conn1.Close()

ctx, cancelFn := context.WithCancel(context.Background())
defer cancelFn()

conn := WsConn{Conn: conn1, mu: &sync.Mutex{}}
conn.SetReadLimit(maxMessageSize)
conn.SetPingHandler(func(text string) error {
logutil.HandlerErr(conn.SetReadDeadline(time.Now().Add(p.timeWait)))

log.Info().Str("text", text).Msg("websocket received ping frame")
// 不设置 write deadline
err := conn.WriteControl(websocket.PongMessage, []byte(text), time.Time{})
if err == websocket.ErrCloseSent {
if errors.Is(err, websocket.ErrCloseSent) {
return nil
} else if _, ok := err.(net.Error); ok {
return nil
Expand Down Expand Up @@ -354,3 +357,32 @@ func (w *inMemoryResponseWriter) CloseNotify() <-chan bool {
return w.closed
}
func (w *inMemoryResponseWriter) Flush() {}

type WsConn struct {
*websocket.Conn
mu *sync.Mutex
}

func (ws WsConn) WritePreparedMessage(pm *websocket.PreparedMessage) error {
ws.mu.Lock()
defer ws.mu.Unlock()
return ws.Conn.WritePreparedMessage(pm)
}

func (ws WsConn) WriteJSON(v interface{}) error {
ws.mu.Lock()
defer ws.mu.Unlock()
return ws.Conn.WriteJSON(v)
}

func (ws WsConn) WriteControl(messageType int, data []byte, deadline time.Time) error {
ws.mu.Lock()
defer ws.mu.Unlock()
return ws.Conn.WriteControl(messageType, data, deadline)
}

func (ws WsConn) WriteMessage(messageType int, data []byte) error {
ws.mu.Lock()
defer ws.mu.Unlock()
return ws.Conn.WriteMessage(messageType, data)
}
Loading