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

sftpd: remove unused expectedSize field from Transfer struct

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2020-05-20 20:17:59 +02:00
parent cfa710037c
commit 15298b0409
4 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sftpd/handler.go
View File

@@ -60,11 +60,6 @@ func (c Connection) Fileread(request *sftp.Request) (io.ReaderAt, error) {
return nil, vfs.GetSFTPError(c.fs, err) return nil, vfs.GetSFTPError(c.fs, err)
} }
fi, err := c.fs.Stat(p)
if err != nil {
return nil, vfs.GetSFTPError(c.fs, err)
}
file, r, cancelFn, err := c.fs.Open(p) file, r, cancelFn, err := c.fs.Open(p)
if err != nil { if err != nil {
c.Log(logger.LevelWarn, logSender, "could not open file %#v for reading: %+v", p, err) c.Log(logger.LevelWarn, logSender, "could not open file %#v for reading: %+v", p, err)
@@ -91,7 +86,6 @@ func (c Connection) Fileread(request *sftp.Request) (io.ReaderAt, error) {
transferError: nil, transferError: nil,
isFinished: false, isFinished: false,
minWriteOffset: 0, minWriteOffset: 0,
expectedSize: fi.Size(),
isExcludedFromQuota: c.User.IsFileExcludedFromQuota(request.Filepath), isExcludedFromQuota: c.User.IsFileExcludedFromQuota(request.Filepath),
lock: new(sync.Mutex), lock: new(sync.Mutex),
} }

4
sftpd/internal_test.go
View File

@@ -274,7 +274,6 @@ func TestReadWriteErrors(t *testing.T) {
transferError: nil, transferError: nil,
isFinished: false, isFinished: false,
minWriteOffset: 0, minWriteOffset: 0,
expectedSize: 10,
lock: new(sync.Mutex), lock: new(sync.Mutex),
} }
err = file.Close() err = file.Close()
@@ -285,7 +284,7 @@ func TestReadWriteErrors(t *testing.T) {
_, err = transfer.ReadAt(buf, 0) _, err = transfer.ReadAt(buf, 0)
assert.Error(t, err, "reading from a closed file must fail") assert.Error(t, err, "reading from a closed file must fail")
err = transfer.Close() err = transfer.Close()
assert.Error(t, err, "upoload must fail: the expected size does not match") assert.Error(t, err)
r, _, err := pipeat.Pipe() r, _, err := pipeat.Pipe()
assert.NoError(t, err) assert.NoError(t, err)
@@ -374,7 +373,6 @@ func TestTransferCancelFn(t *testing.T) {
transferError: nil, transferError: nil,
isFinished: false, isFinished: false,
minWriteOffset: 0, minWriteOffset: 0,
expectedSize: 10,
lock: new(sync.Mutex), lock: new(sync.Mutex),
} }
errFake := errors.New("fake error, this will trigger cancelFn") errFake := errors.New("fake error, this will trigger cancelFn")

1
sftpd/scp.go
View File

@@ -512,7 +512,6 @@ func (c *scpCommand) handleDownload(filePath string) error {
transferError: nil, transferError: nil,
isFinished: false, isFinished: false,
minWriteOffset: 0, minWriteOffset: 0,
expectedSize: stat.Size(),
lock: new(sync.Mutex), lock: new(sync.Mutex),
} }
addTransfer(&transfer) addTransfer(&transfer)

1
sftpd/transfer.go
View File

@@ -43,7 +43,6 @@ type Transfer struct {
protocol string protocol string
transferError error transferError error
minWriteOffset int64 minWriteOffset int64
expectedSize int64
initialSize int64 initialSize int64
lock *sync.Mutex lock *sync.Mutex
isNewFile bool isNewFile bool