Skip to content

[v16] Prevent forwarded tcpip requests hanging indefinitely #50239

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
rosstimothy merged 1 commit into from
Dec 13, 2024
Merged

[v16] Prevent forwarded tcpip requests hanging indefinitely #50239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions lib/srv/forward/sshserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"fmt"
"io"
"net"
"os"
"strings"
"time"

Expand Down Expand Up @@ -1062,8 +1063,12 @@ func (s *Server) handleDirectTCPIPRequest(ctx context.Context, ch ssh.Channel, r
if err != nil {
s.log.Errorf("Unable to create connection context: %v.", err)
s.stderrWrite(ch, "Unable to create connection context.")
if err := ch.Close(); err != nil {
s.log.Warnf("Failed to close channel: %v", err)
}
return
}
scx.AddCloser(ch)
scx.RemoteClient = s.remoteClient
scx.ExecType = teleport.ChanDirectTCPIP
scx.SrcAddr = sshutils.JoinHostPort(req.Orig, req.OrigPort)
Expand Down Expand Up @@ -1095,8 +1100,8 @@ func (s *Server) handleDirectTCPIPRequest(ctx context.Context, ch ssh.Channel, r
scx.WithError(err).Warn("Failed to emit port forward event.")
}

if err := utils.ProxyConn(ctx, ch, conn); err != nil {
s.log.WithError(err).Warn("Pailed proxying data for port forwarding connection.")
if err := utils.ProxyConn(ctx, ch, conn); err != nil && !errors.Is(err, io.EOF) && !errors.Is(err, os.ErrClosed) {
s.log.WithError(err).Warn("Failed proxying data for port forwarding connection.")
}
}

Expand Down