Skip to content

fix: accept concurrent SFTP session channels #321

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

Open
metabrixkt wants to merge 1 commit into
base: develop
Choose a base branch
from
+14 −3
Open

fix: accept concurrent SFTP session channels #321

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
17 changes: 14 additions & 3 deletions sftp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"regexp"
"strconv"
"strings"
"sync"

"emperror.dev/errors"
"github.com/apex/log"
Expand Down Expand Up @@ -125,6 +126,7 @@ func (c *SFTPServer) AcceptInbound(conn net.Conn, config *ssh.ServerConfig) erro
defer sconn.Close()
go ssh.DiscardRequests(reqs)

var wg sync.WaitGroup
for ch := range chans {
// If its not a session channel we just move on because its not something we
// know how to handle at this point.
Expand All @@ -147,13 +149,22 @@ func (c *SFTPServer) AcceptInbound(conn net.Conn, config *ssh.ServerConfig) erro
}
}(requests)

if srv, ok := c.manager.Get(sconn.Permissions.Extensions["uuid"]); ok {
srv, ok := c.manager.Get(sconn.Permissions.Extensions["uuid"])
if !ok {
_ = channel.Close()
continue
}

wg.Add(1)
go func(srv *server.Server, channel ssh.Channel) {
defer wg.Done()
if err := c.Handle(sconn, srv, channel); err != nil {
return err
log.WithField("error", err).WithField("user", sconn.User()).Error("sftp: failed to handle session")
}
}
}(srv, channel)
}

wg.Wait()
return nil
}

Expand Down