Merge pull request #535 from drakkan/errwrap

statusFromError: improve support for error wrapping
pkg · Jan 4, 2023 · 2489717 · 2489717
2 parents 707787e + 0888097
commit 2489717
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/server.go b/server.go
@@ -615,13 +615,15 @@ func statusFromError(id uint32, err error) *sshFxpStatusPacket {
 		return ret
 	}
 
-	switch e := err.(type) {
-	case fxerr:
+	if errors.Is(err, io.EOF) {
+		ret.StatusError.Code = sshFxEOF
+		return ret
+	}
+
+	var e fxerr
+	if errors.As(err, &e) {
 		ret.StatusError.Code = uint32(e)
-	default:
-		if e == io.EOF {
-			ret.StatusError.Code = sshFxEOF
-		}
+		return ret
 	}
 
 	return ret

diff --git a/sftp_test.go b/sftp_test.go
@@ -2,6 +2,7 @@ package sftp
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"syscall"
 	"testing"
@@ -19,6 +20,8 @@ func TestErrFxCode(t *testing.T) {
 		{err: syscall.ENOENT, fx: ErrSSHFxNoSuchFile},
 		{err: syscall.EPERM, fx: ErrSSHFxPermissionDenied},
 		{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 {
 		statusErr := statusFromError(1, tt.err).StatusError