From 0d387d979909835c3b91336d8592e7a0697bdedf Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 21 Jan 2024 15:46:38 +0100 Subject: [PATCH] prefer errors.As to errors.Is Signed-off-by: Nicola Murino --- go.mod | 2 +- go.sum | 4 ++-- internal/sftpd/server.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c2f11f63..82f6c50f 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/lestrrat-go/jwx/v2 v2.0.19 github.com/lithammer/shortuuid/v3 v3.0.7 github.com/mattn/go-sqlite3 v1.14.19 - github.com/mhale/smtpd v0.8.1 + github.com/mhale/smtpd v0.8.2 github.com/minio/sio v0.3.1 github.com/otiai10/copy v1.14.0 github.com/pires/go-proxyproto v0.7.0 diff --git a/go.sum b/go.sum index f78e735f..f5099d80 100644 --- a/go.sum +++ b/go.sum @@ -288,8 +288,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mhale/smtpd v0.8.1 h1:O02u8O3eYAGxZCGf4E98WjyB+rA3DVFZtchEialjX4s= -github.com/mhale/smtpd v0.8.1/go.mod h1:MQl+y2hwIEQCXtNhe5+55n0GZOjSmeqORDIXbqUL3x4= +github.com/mhale/smtpd v0.8.2 h1:rHKOMHeFoDvcq8Na9ErCbNcjlWTSyGtznOmJpWsOzuc= +github.com/mhale/smtpd v0.8.2/go.mod h1:MQl+y2hwIEQCXtNhe5+55n0GZOjSmeqORDIXbqUL3x4= github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/minio/sio v0.3.1 h1:d59r5RTHb1OsQaSl1EaTWurzMMDRLA5fgNmjzD4eVu4= diff --git a/internal/sftpd/server.go b/internal/sftpd/server.go index c7068fab..007a496f 100644 --- a/internal/sftpd/server.go +++ b/internal/sftpd/server.go @@ -283,7 +283,8 @@ func (c *Configuration) getServerConfig() *ssh.ServerConfig { MaxAuthTries: c.MaxAuthTries, PublicKeyCallback: func(conn ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) { sp, err := c.validatePublicKeyCredentials(conn, pubKey) - if errors.Is(err, &ssh.PartialSuccessError{}) { + var partialSuccess *ssh.PartialSuccessError + if errors.As(err, &partialSuccess) { return sp, err } if err != nil {