Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 14:50:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

sftpd: properly handle listener accept errors

Browse Source 
continue on temporary errors and exit from the serve loop for the
other ones
This commit is contained in:
Nicola Murino
2020-12-23 19:53:07 +01:00
parent 7ab7941ddd
commit 187a5b1908
5 changed files with 115 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
sftpd/server.go
View File

@@ -15,7 +15,6 @@ import (
"strings"
"time"
"github.com/pires/go-proxyproto"
"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
@@ -224,7 +223,7 @@ func (c *Configuration) Initialize(configDir string) error {
c.configureLoginBanner(serverConfig, configDir)
c.checkSSHCommands()
exitChannel := make(chan error)
exitChannel := make(chan error, 1)
serviceStatus.Bindings = nil
for _, binding := range c.Bindings {
@@ -234,7 +233,27 @@ func (c *Configuration) Initialize(configDir string) error {
serviceStatus.Bindings = append(serviceStatus.Bindings, binding)
go func(binding Binding) {
exitChannel <- c.listenAndServe(binding, serverConfig)
addr := binding.GetAddress()
listener, err := net.Listen("tcp", addr)
if err != nil {
logger.Warn(logSender, "", "error starting listener on address %v: %v", addr, err)
exitChannel <- err
return
}
if binding.ApplyProxyConfig {
proxyListener, err := common.Config.GetProxyListener(listener)
if err != nil {
logger.Warn(logSender, "", "error enabling proxy listener: %v", err)
exitChannel <- err
return
}
if proxyListener != nil {
listener = proxyListener
}
}
exitChannel <- c.serve(listener, serverConfig)
}(binding)
}
@@ -244,33 +263,31 @@ func (c *Configuration) Initialize(configDir string) error {
return <-exitChannel
}
func (c *Configuration) listenAndServe(binding Binding, serverConfig *ssh.ServerConfig) error {
addr := binding.GetAddress()
listener, err := net.Listen("tcp", addr)
if err != nil {
logger.Warn(logSender, "", "error starting listener on address %v: %v", addr, err)
return err
}
var proxyListener *proxyproto.Listener
func (c *Configuration) serve(listener net.Listener, serverConfig *ssh.ServerConfig) error {
logger.Info(logSender, "", "server listener registered, address: %v", listener.Addr().String())
var tempDelay time.Duration // how long to sleep on accept failure
if binding.ApplyProxyConfig {
proxyListener, err = common.Config.GetProxyListener(listener)
for {
conn, err := listener.Accept()
if err != nil {
logger.Warn(logSender, "", "error enabling proxy listener: %v", err)
if ne, ok := err.(net.Error); ok && ne.Temporary() {
if tempDelay == 0 {
tempDelay = 5 * time.Millisecond
} else {
tempDelay *= 2
}
if max := 1 * time.Second; tempDelay > max {
tempDelay = max
}
logger.Warn(logSender, "", "accept error: %v; retrying in %v", err, tempDelay)
time.Sleep(tempDelay)
continue
}
logger.Warn(logSender, "", "unrecoverable accept error: %v", err)
return err
}
}
logger.Info(logSender, "", "server listener registered, address: %v", listener.Addr().String())
for {
var conn net.Conn
if proxyListener != nil {
conn, err = proxyListener.Accept()
} else {
conn, err = listener.Accept()
}
if conn != nil && err == nil {
go c.AcceptInboundConnection(conn, serverConfig)
}
go c.AcceptInboundConnection(conn, serverConfig)
}
}