Skip to content

fix: terminal websocket write lock to avoid races #10011

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.

Sign up for GitHub

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
alexmt merged 3 commits into from
Jul 16, 2022
Merged

fix: terminal websocket write lock to avoid races #10011

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2244ee
fix: protect terminal WriteMessage with a lock
crenshaw-dev Jul 14, 2022
f45aeaf
give write its own lock
crenshaw-dev Jul 15, 2022
1936d8e
Merge remote-tracking branch 'origin/master' into terminal-write-lock
crenshaw-dev Jul 15, 2022
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
16 changes: 10 additions & 6 deletions server/application/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ var upgrader = func() websocket.Upgrader {

// terminalSession implements PtyHandler
type terminalSession struct {
wsConn *websocket.Conn
sizeChan chan remotecommand.TerminalSize
doneChan chan struct{}
tty bool
readLock sync.Mutex
wsConn *websocket.Conn
sizeChan chan remotecommand.TerminalSize
doneChan chan struct{}
tty bool
readLock sync.Mutex
writeLock sync.Mutex
}

// newTerminalSession create terminalSession
Expand Down Expand Up @@ -95,7 +96,10 @@ func (t *terminalSession) Write(p []byte) (int, error) {
log.Errorf("write parse message err: %v", err)
return 0, err
}
if err := t.wsConn.WriteMessage(websocket.TextMessage, msg); err != nil {
t.writeLock.Lock()
err = t.wsConn.WriteMessage(websocket.TextMessage, msg)
t.writeLock.Unlock()
if err != nil {
log.Errorf("write message err: %v", err)
return 0, err
}
Expand Down