root
/
sftp
mirror of https://github.com/pkg/sftp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

statusFromError: improve support for error wrapping

This commit is contained in:
Nicola Murino 2022-12-25 17:21:42 +01:00
parent 707787e8bc
commit 08880975fb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server.go
View File

@ -615,13 +615,15 @@ func statusFromError(id uint32, err error) *sshFxpStatusPacket {
return ret return ret
} }
switch e := err.(type) { if errors.Is(err, io.EOF) {
case fxerr: ret.StatusError.Code = sshFxEOF
return ret
}
var e fxerr
if errors.As(err, &e) {
ret.StatusError.Code = uint32(e) ret.StatusError.Code = uint32(e)
default: return ret
if e == io.EOF {
ret.StatusError.Code = sshFxEOF
}
} }
return ret return ret

3
sftp_test.go
View File

@ -2,6 +2,7 @@ package sftp
import ( import (
"errors" "errors"
"fmt"
"io" "io"
"syscall" "syscall"
"testing" "testing"
@ -19,6 +20,8 @@ func TestErrFxCode(t *testing.T) {
{err: syscall.ENOENT, fx: ErrSSHFxNoSuchFile}, {err: syscall.ENOENT, fx: ErrSSHFxNoSuchFile},
{err: syscall.EPERM, fx: ErrSSHFxPermissionDenied}, {err: syscall.EPERM, fx: ErrSSHFxPermissionDenied},
{err: io.EOF, fx: ErrSSHFxEOF}, {err: io.EOF, fx: ErrSSHFxEOF},
{err: fmt.Errorf("wrapped permission denied error: %w", ErrSSHFxPermissionDenied), fx: ErrSSHFxPermissionDenied},
{err: fmt.Errorf("wrapped op unsupported error: %w", ErrSSHFxOpUnsupported), fx: ErrSSHFxOpUnsupported},
} }
for _, tt := range table { for _, tt := range table {
statusErr := statusFromError(1, tt.err).StatusError statusErr := statusFromError(1, tt.err).StatusError