Skip to content

[v13] Prevent panic when fileTransferRequestC is closed. #25861

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
jakule merged 2 commits into from
May 8, 2023
Merged

[v13] Prevent panic when fileTransferRequestC is closed. #25861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f26c11
Prevent panic when fileTransferRequestC is closed.
jakule May 8, 2023
e382294
Clean the code
jakule May 8, 2023
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
45 changes: 28 additions & 17 deletions lib/web/terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,16 +883,31 @@ func (t *TerminalHandler) handleFileTransfer(fileTransferRequestC <-chan *sessio
case <-t.terminalContext.Done():
return
case transferRequest := <-fileTransferRequestC:
t.sshSession.RequestFileTransfer(t.terminalContext, tracessh.FileTransferReq{
if transferRequest == nil {
// channel closed
continue
}
if err := t.sshSession.RequestFileTransfer(t.terminalContext, tracessh.FileTransferReq{
Download: transferRequest.Download,
Location: transferRequest.Location,
Filename: transferRequest.Filename,
})
}); err != nil {
t.log.WithError(err).Error("Unable to request file transfer")
}
case transferResponse := <-fileTransferDecisionC:
if transferResponse == nil {
// channel closed
continue
}

var err error
if transferResponse.Approved {
t.sshSession.ApproveFileTransferRequest(t.terminalContext, transferResponse.RequestID)
err = t.sshSession.ApproveFileTransferRequest(t.terminalContext, transferResponse.RequestID)
} else {
t.sshSession.DenyFileTransferRequest(t.terminalContext, transferResponse.RequestID)
err = t.sshSession.DenyFileTransferRequest(t.terminalContext, transferResponse.RequestID)
}
if err != nil {
t.log.WithError(err).Error("Unable to respond to file transfer request")
}
}

Expand Down Expand Up @@ -1041,7 +1056,7 @@ type TerminalStream struct {
// fit into the buffer provided by the callee to Read method
buffer []byte

// once ensures that resizeC is closed at most one time
// once ensures that all channels are closed at most one time.
once sync.Once
// resizeC a channel to forward resize events so that
// they happen out of band and don't block reads
Expand Down Expand Up @@ -1280,23 +1295,19 @@ func (t *TerminalStream) Read(out []byte) (n int, err error) {
// Close send a close message on the web socket
// prior to closing the web socket altogether.
func (t *TerminalStream) Close() error {
if t.resizeC != nil {
t.once.Do(func() {
t.once.Do(func() {
if t.resizeC != nil {
close(t.resizeC)
})
}
}

if t.fileTransferRequestC != nil {
t.once.Do(func() {
if t.fileTransferRequestC != nil {
close(t.fileTransferRequestC)
})
}
}

if t.fileTransferDecisionC != nil {
t.once.Do(func() {
if t.fileTransferDecisionC != nil {
close(t.fileTransferDecisionC)
})
}
}
})

// Send close envelope to web terminal upon exit without an error.
envelope := &Envelope{
Expand Down