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

don't expose underlying errors to clients

Browse Source 
log them and return a generic failure

Fixes #896

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-06-28 22:08:16 +02:00
parent 101783ee86
commit 719f6077ab
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/connection.go
View File

@@ -1345,9 +1345,11 @@ func (c *BaseConnection) GetGenericError(err error) error {
} }
if err != nil { if err != nil {
if e, ok := err.(*os.PathError); ok { if e, ok := err.(*os.PathError); ok {
c.Log(logger.LevelError, "generic path error: %+v", e)
return fmt.Errorf("%w: %v %v", sftp.ErrSSHFxFailure, e.Op, e.Err.Error()) return fmt.Errorf("%w: %v %v", sftp.ErrSSHFxFailure, e.Op, e.Err.Error())
} }
return fmt.Errorf("%w: %v", sftp.ErrSSHFxFailure, err.Error()) c.Log(logger.LevelError, "generic error: %+v", err)
return fmt.Errorf("%w: %v", sftp.ErrSSHFxFailure, ErrGenericFailure.Error())
} }
return sftp.ErrSSHFxFailure return sftp.ErrSSHFxFailure
default: default:

2
common/connection_test.go
View File

@@ -325,14 +325,12 @@ func TestErrorsMapping(t *testing.T) {
err = conn.GetFsError(fs, os.ErrClosed) err = conn.GetFsError(fs, os.ErrClosed)
if protocol == ProtocolSFTP { if protocol == ProtocolSFTP {
assert.ErrorIs(t, err, sftp.ErrSSHFxFailure) assert.ErrorIs(t, err, sftp.ErrSSHFxFailure)
assert.Contains(t, err.Error(), os.ErrClosed.Error())
} else { } else {
assert.EqualError(t, err, ErrGenericFailure.Error()) assert.EqualError(t, err, ErrGenericFailure.Error())
} }
err = conn.GetFsError(fs, ErrPermissionDenied) err = conn.GetFsError(fs, ErrPermissionDenied)
if protocol == ProtocolSFTP { if protocol == ProtocolSFTP {
assert.ErrorIs(t, err, sftp.ErrSSHFxFailure) assert.ErrorIs(t, err, sftp.ErrSSHFxFailure)
assert.Contains(t, err.Error(), ErrPermissionDenied.Error())
} else { } else {
assert.EqualError(t, err, ErrPermissionDenied.Error()) assert.EqualError(t, err, ErrPermissionDenied.Error())
} }

2
sftpd/internal_test.go
View File

@@ -176,7 +176,6 @@ func TestUploadResumeInvalidOffset(t *testing.T) {
err = transfer.Close() err = transfer.Close()
if assert.Error(t, err) { if assert.Error(t, err) {
assert.ErrorIs(t, err, sftp.ErrSSHFxFailure) assert.ErrorIs(t, err, sftp.ErrSSHFxFailure)
assert.Contains(t, err.Error(), "invalid write offset")
} }
err = os.Remove(testfile) err = os.Remove(testfile)
@@ -278,7 +277,6 @@ func TestTransferCancelFn(t *testing.T) {
err = transfer.Close() err = transfer.Close()
if assert.Error(t, err) { if assert.Error(t, err) {
assert.ErrorIs(t, err, sftp.ErrSSHFxFailure) assert.ErrorIs(t, err, sftp.ErrSSHFxFailure)
assert.Contains(t, err.Error(), errFake.Error())
} }
if assert.Error(t, transfer.ErrTransfer) { if assert.Error(t, transfer.ErrTransfer) {
assert.EqualError(t, transfer.ErrTransfer, errFake.Error()) assert.EqualError(t, transfer.ErrTransfer, errFake.Error())