mirror of
https://github.com/drakkan/sftpgo.git
synced 2024-11-24 00:20:25 +00:00
DirLister: returns appropriate protocol errors
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
parent
77b2f8dfb3
commit
ca41b59fc4
2 changed files with 8 additions and 10 deletions
|
@ -322,10 +322,9 @@ func (c *BaseConnection) ListDir(virtualPath string) (*DirListerAt, error) {
|
|||
}
|
||||
return &DirListerAt{
|
||||
virtualPath: virtualPath,
|
||||
user: &c.User,
|
||||
conn: c,
|
||||
fs: fs,
|
||||
info: c.User.GetVirtualFoldersInfo(virtualPath),
|
||||
id: c.ID,
|
||||
protocol: c.protocol,
|
||||
lister: lister,
|
||||
}, nil
|
||||
}
|
||||
|
@ -1790,10 +1789,9 @@ func (c *BaseConnection) GetFsAndResolvedPath(virtualPath string) (vfs.Fs, strin
|
|||
// DirListerAt defines a directory lister implementing the ListAt method.
|
||||
type DirListerAt struct {
|
||||
virtualPath string
|
||||
user *dataprovider.User
|
||||
conn *BaseConnection
|
||||
fs vfs.Fs
|
||||
info []os.FileInfo
|
||||
id string
|
||||
protocol string
|
||||
mu sync.Mutex
|
||||
lister vfs.DirLister
|
||||
}
|
||||
|
@ -1836,10 +1834,10 @@ func (l *DirListerAt) Next(limit int) ([]os.FileInfo, error) {
|
|||
for {
|
||||
files, err := l.lister.Next(limit)
|
||||
if err != nil && !errors.Is(err, io.EOF) {
|
||||
logger.Debug(l.protocol, l.id, "error retrieving directory entries: %+v", err)
|
||||
return files, err
|
||||
l.conn.Log(logger.LevelDebug, "error retrieving directory entries: %+v", err)
|
||||
return files, l.conn.GetFsError(l.fs, err)
|
||||
}
|
||||
files = l.user.FilterListDir(files, l.virtualPath)
|
||||
files = l.conn.User.FilterListDir(files, l.virtualPath)
|
||||
if len(l.info) > 0 {
|
||||
files = slices.Concat(l.info, files)
|
||||
l.info = nil
|
||||
|
|
|
@ -1091,7 +1091,7 @@ func TestListerAt(t *testing.T) {
|
|||
require.ErrorIs(t, err, io.EOF)
|
||||
require.Len(t, files, 0)
|
||||
_, err = lister.Next(-1)
|
||||
require.ErrorContains(t, err, "invalid limit")
|
||||
require.ErrorContains(t, err, conn.GetGenericError(err).Error())
|
||||
err = lister.Close()
|
||||
require.NoError(t, err)
|
||||
|
||||
|
|
Loading…
Reference in a new issue