Skip to content
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

Jump to bottom

Remove unnecessary buffered reader wrapper #39343

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Remove unnecessary buffered reader wrapper #39343

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 2 additions & 20 deletions tool/teleport/common/sftp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,6 @@ func (c compositeCh) Close() error {
return trace.NewAggregate(c.r.Close(), c.w.Close())
}

// bufferedReaderCloser wraps a [bufio.Reader] to make it an [io.ReadCloser].
type bufferedReaderCloser struct {
bufio.Reader

inner io.ReadCloser
}

func newBufferedReaderCloser(r io.ReadCloser) *bufferedReaderCloser {
return &bufferedReaderCloser{
Reader: *bufio.NewReader(r),
inner: r,
}
}

func (b *bufferedReaderCloser) Close() error {
return b.inner.Close()
}

type allowedOps struct {
write bool
path string
Expand Down Expand Up @@ -603,7 +585,7 @@ func onSFTP() error {
}

// Read the file transfer request for this session if one exists
bufferedReader := newBufferedReaderCloser(chr)
bufferedReader := bufio.NewReader(chr)
var encodedReq []byte
var fileTransferReq *srv.FileTransferRequest
for {
Expand All @@ -623,7 +605,7 @@ func onSFTP() error {
return trace.Wrap(err)
}
}
ch := compositeCh{bufferedReader, chw}
ch := compositeCh{io.NopCloser(bufferedReader), chw}

sftpEvents := make(chan *apievents.SFTP, 1)
h, err := newSFTPHandler(logger, fileTransferReq, sftpEvents)
Expand Down