beenull/sftpgo-mirror
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2024-11-21 23:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

EventManager: always close the connection filesystem
Some checks are pending
Code scanning - action / CodeQL-Build (push) Waiting to run
Details
CI / Test and deploy (push) Waiting to run
Details
CI / Test build flags (push) Waiting to run
Details
CI / Test with PgSQL/MySQL/Cockroach (push) Waiting to run
Details
CI / Build Linux packages (push) Waiting to run
Details
CI / golangci-lint (push) Waiting to run
Details
Docker / Build (push) Waiting to run
Details

Browse source 
closing the user filesystem is not enough here

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2024-11-20 20:51:20 +01:00
parent 2fad0467d9
commit 5212095b89
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
internal/common/eventmanager.go
View file

@ -1370,6 +1370,9 @@ func getHTTPRuleActionBody(c *dataprovider.EventActionHTTPConfig, replacer *stri
go func() { go func() {
defer w.Close() defer w.Close()
defer user.CloseFs() //nolint:errcheck defer user.CloseFs() //nolint:errcheck
if conn != nil {
defer conn.CloseFS() //nolint:errcheck
}
for _, part := range c.Parts { for _, part := range c.Parts {
h := make(textproto.MIMEHeader) h := make(textproto.MIMEHeader)
@ -1587,6 +1590,8 @@ func executeEmailRuleAction(c dataprovider.EventActionEmailConfig, params *Event
return fmt.Errorf("error getting email attachments, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("error getting email attachments, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
res, err := getMailAttachments(conn, fileAttachments, replacer) res, err := getMailAttachments(conn, fileAttachments, replacer)
if err != nil { if err != nil {
return err return err
@ -1648,6 +1653,8 @@ func executeDeleteFsActionForUser(deletes []string, replacer *strings.Replacer,
return fmt.Errorf("delete error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("delete error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
for _, item := range replacePathsPlaceholders(deletes, replacer) { for _, item := range replacePathsPlaceholders(deletes, replacer) {
info, err := conn.DoStat(item, 0, false) info, err := conn.DoStat(item, 0, false)
if err != nil { if err != nil {
@ -1716,6 +1723,8 @@ func executeMkDirsFsActionForUser(dirs []string, replacer *strings.Replacer, use
return fmt.Errorf("mkdir error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("mkdir error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
for _, item := range replacePathsPlaceholders(dirs, replacer) { for _, item := range replacePathsPlaceholders(dirs, replacer) {
if err = conn.CheckParentDirs(path.Dir(item)); err != nil { if err = conn.CheckParentDirs(path.Dir(item)); err != nil {
return fmt.Errorf("unable to check parent dirs for %q, user %q: %w", item, user.Username, err) return fmt.Errorf("unable to check parent dirs for %q, user %q: %w", item, user.Username, err)
@ -1775,6 +1784,8 @@ func executeRenameFsActionForUser(renames []dataprovider.KeyValue, replacer *str
return fmt.Errorf("rename error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("rename error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
for _, item := range renames { for _, item := range renames {
source := util.CleanPath(replaceWithReplacer(item.Key, replacer)) source := util.CleanPath(replaceWithReplacer(item.Key, replacer))
target := util.CleanPath(replaceWithReplacer(item.Value, replacer)) target := util.CleanPath(replaceWithReplacer(item.Value, replacer))
@ -1800,6 +1811,8 @@ func executeCopyFsActionForUser(keyVals []dataprovider.KeyValue, replacer *strin
return fmt.Errorf("copy error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("copy error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
for _, item := range keyVals { for _, item := range keyVals {
source := util.CleanPath(replaceWithReplacer(item.Key, replacer)) source := util.CleanPath(replaceWithReplacer(item.Key, replacer))
target := util.CleanPath(replaceWithReplacer(item.Value, replacer)) target := util.CleanPath(replaceWithReplacer(item.Value, replacer))
@ -1831,6 +1844,8 @@ func executeExistFsActionForUser(exist []string, replacer *strings.Replacer,
return fmt.Errorf("existence check error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("existence check error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
for _, item := range replacePathsPlaceholders(exist, replacer) { for _, item := range replacePathsPlaceholders(exist, replacer) {
if _, err = conn.DoStat(item, 0, false); err != nil { if _, err = conn.DoStat(item, 0, false); err != nil {
return fmt.Errorf("error checking existence for path %q, user %q: %w", item, user.Username, err) return fmt.Errorf("error checking existence for path %q, user %q: %w", item, user.Username, err)
@ -1989,6 +2004,8 @@ func executeCompressFsActionForUser(c dataprovider.EventActionFsCompress, replac
return fmt.Errorf("compress error, unable to check root fs for user %q: %w", user.Username, err) return fmt.Errorf("compress error, unable to check root fs for user %q: %w", user.Username, err)
} }
conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user) conn := NewBaseConnection(connectionID, protocolEventAction, "", "", user)
defer conn.CloseFS() //nolint:errcheck
name := util.CleanPath(replaceWithReplacer(c.Name, replacer)) name := util.CleanPath(replaceWithReplacer(c.Name, replacer))
conn.CheckParentDirs(path.Dir(name)) //nolint:errcheck conn.CheckParentDirs(path.Dir(name)) //nolint:errcheck
paths := make([]string, 0, len(c.Paths)) paths := make([]string, 0, len(c.Paths))

1
internal/httpd/api_shares.go
View file

@ -562,6 +562,7 @@ func validateBrowsableShare(share dataprovider.Share, connection *Connection) er
basePath := share.Paths[0] basePath := share.Paths[0]
info, err := connection.Stat(basePath, 0) info, err := connection.Stat(basePath, 0)
if err != nil { if err != nil {
connection.CloseFS() //nolint:errcheck
return util.NewI18nError( return util.NewI18nError(
fmt.Errorf("unable to check the share directory: %w", err), fmt.Errorf("unable to check the share directory: %w", err),
util.I18nErrorShareInvalidPath, util.I18nErrorShareInvalidPath,