From 88122ba2f84343e93a689a6674d9098147eb6116 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Fri, 5 Mar 2021 18:50:45 +0100 Subject: [PATCH] update jwtauth to v5 --- go.mod | 13 +++++++------ go.sum | 25 ++++++++++++------------- httpd/api_admin.go | 2 +- httpd/auth_utils.go | 2 +- httpd/httpd.go | 2 +- httpd/internal_test.go | 2 +- httpd/middleware.go | 2 +- httpd/server.go | 2 +- vfs/osfs.go | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 89aeb2d0..3ed71911 100644 --- a/go.mod +++ b/go.mod @@ -9,17 +9,18 @@ require ( github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect github.com/alexedwards/argon2id v0.0.0-20201228115903-cf543ebc1f7b - github.com/aws/aws-sdk-go v1.37.22 + github.com/aws/aws-sdk-go v1.37.24 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/eikenb/pipeat v0.0.0-20200430215831-470df5986b6d github.com/fclairamb/ftpserverlib v0.13.0 github.com/frankban/quicktest v1.11.3 // indirect github.com/go-chi/chi/v5 v5.0.0 - github.com/go-chi/jwtauth v1.2.0 + github.com/go-chi/jwtauth/v5 v5.0.0 github.com/go-chi/render v1.0.1 github.com/go-ole/go-ole v1.2.5 // indirect github.com/go-sql-driver/mysql v1.5.0 github.com/golang/snappy v0.0.3 // indirect + github.com/google/go-cmp v0.5.5 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.2.0 // indirect github.com/google/wire v0.5.0 // indirect @@ -38,7 +39,7 @@ require ( github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/otiai10/copy v1.5.0 github.com/pelletier/go-toml v1.8.1 // indirect - github.com/pires/go-proxyproto v0.4.2 + github.com/pires/go-proxyproto v0.5.0 github.com/pkg/sftp v1.12.1-0.20210222152308-b8102da57e75 github.com/prometheus/client_golang v1.9.0 github.com/prometheus/common v0.18.0 // indirect @@ -62,9 +63,9 @@ require ( gocloud.dev v0.22.0 gocloud.dev/secrets/hashivault v0.22.0 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 - golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect - golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 + golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect google.golang.org/api v0.40.0 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb // indirect @@ -77,5 +78,5 @@ require ( replace ( github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20210224210502-6cb69ad5dd3c - golang.org/x/net => github.com/drakkan/net v0.0.0-20210224210113-f377ea59e9aa + golang.org/x/net => github.com/drakkan/net v0.0.0-20210305154355-3793bc96d0e5 ) diff --git a/go.sum b/go.sum index 04e8facf..dd88c58f 100644 --- a/go.sum +++ b/go.sum @@ -116,8 +116,8 @@ github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZo github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.36.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.37.22 h1:cyZp8TvUbH9rrShdrwULtCj4pB5szddrw9aKHUsw1Ic= -github.com/aws/aws-sdk-go v1.37.22/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.37.24 h1:UmdPwGITvz//eFxNyuPlkq8KLlu4ZGvowsCQs+uFIp4= +github.com/aws/aws-sdk-go v1.37.24/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -175,8 +175,8 @@ github.com/drakkan/crypto v0.0.0-20210224210502-6cb69ad5dd3c h1:tzCmj3xkRqOXKwsX github.com/drakkan/crypto v0.0.0-20210224210502-6cb69ad5dd3c/go.mod h1:oWIEupC5a8UqUNgZ3pIfCYRNm3RQypJhQmmPYw5b4hY= github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 h1:LPH1dEblAOO/LoG7yHPMtBLXhQmjaga91/DDjWk9jWA= github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU= -github.com/drakkan/net v0.0.0-20210224210113-f377ea59e9aa h1:kUibtfOIKhmMxAoZTB2xtYqSpGntbeCnrzLoXRb459U= -github.com/drakkan/net v0.0.0-20210224210113-f377ea59e9aa/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +github.com/drakkan/net v0.0.0-20210305154355-3793bc96d0e5 h1:LW2c7sNSowt9UJMuWJcn4QmYf9NBQWUSlNlXAPGXzis= +github.com/drakkan/net v0.0.0-20210305154355-3793bc96d0e5/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= @@ -210,12 +210,10 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= -github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= github.com/go-chi/chi/v5 v5.0.0 h1:DBPx88FjZJH3FsICfDAfIfnb7XxKIYVGG6lOPlhENAg= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-chi/jwtauth v1.2.0 h1:Z116SPpevIABBYsv8ih/AHYBHmd4EufKSKsLUnWdrTM= -github.com/go-chi/jwtauth v1.2.0/go.mod h1:NTUpKoTQV6o25UwYE6w/VaLUu83hzrVKYTVo+lE6qDA= +github.com/go-chi/jwtauth/v5 v5.0.0 h1:FjyoBQ0sH6/OSBCTXdRMMd7Eis3UjmsX2wKTSucFn+g= +github.com/go-chi/jwtauth/v5 v5.0.0/go.mod h1:wdYCsXCBuihmcGwLdfVgZ4LhDLOZHfyF+Fd5mEjiGPM= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -301,8 +299,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-replayers/grpcreplay v1.0.0 h1:B5kVOzJ1hBgnevTgIWhSTatQ3608yu/2NnU0Ta1d0kY= github.com/google/go-replayers/grpcreplay v1.0.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= github.com/google/go-replayers/httpreplay v0.1.2 h1:HCfx+dQzwN9XbGTHF8qJ+67WN8glL9FTWV5rraCJ/jU= @@ -566,8 +565,8 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pires/go-proxyproto v0.4.2 h1:VRAvsUCTrmiahoU5fqQqkbY0GWcJ1Q0F7b7CkFaipSU= -github.com/pires/go-proxyproto v0.4.2/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY= +github.com/pires/go-proxyproto v0.5.0 h1:A4Jv4ZCaV3AFJeGh5mGwkz4iuWUYMlQ7IoO/GTuSuLo= +github.com/pires/go-proxyproto v0.5.0/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -844,8 +843,8 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3 h1:RdE7htvBru4I4VZQofQjCZk5W9+aLNlSF5n0zgVwm8s= +golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/httpd/api_admin.go b/httpd/api_admin.go index c0aa94dc..2e3ef2cc 100644 --- a/httpd/api_admin.go +++ b/httpd/api_admin.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/go-chi/render" "github.com/drakkan/sftpgo/dataprovider" diff --git a/httpd/auth_utils.go b/httpd/auth_utils.go index cebbb2ea..61adf772 100644 --- a/httpd/auth_utils.go +++ b/httpd/auth_utils.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/lestrrat-go/jwx/jwt" "github.com/rs/xid" diff --git a/httpd/httpd.go b/httpd/httpd.go index f57de0bd..5fc5ea0a 100644 --- a/httpd/httpd.go +++ b/httpd/httpd.go @@ -15,7 +15,7 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/drakkan/sftpgo/common" "github.com/drakkan/sftpgo/dataprovider" diff --git a/httpd/internal_test.go b/httpd/internal_test.go index 0654f53a..dfbd2523 100644 --- a/httpd/internal_test.go +++ b/httpd/internal_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/lestrrat-go/jwx/jwt" "github.com/rs/xid" "github.com/stretchr/testify/assert" diff --git a/httpd/middleware.go b/httpd/middleware.go index 5454cc8b..7395886d 100644 --- a/httpd/middleware.go +++ b/httpd/middleware.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/lestrrat-go/jwx/jwt" "github.com/drakkan/sftpgo/logger" diff --git a/httpd/server.go b/httpd/server.go index 4092981d..d05abfa9 100644 --- a/httpd/server.go +++ b/httpd/server.go @@ -11,7 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" - "github.com/go-chi/jwtauth" + "github.com/go-chi/jwtauth/v5" "github.com/go-chi/render" "github.com/drakkan/sftpgo/common" diff --git a/vfs/osfs.go b/vfs/osfs.go index c34cd0a7..e9d16253 100644 --- a/vfs/osfs.go +++ b/vfs/osfs.go @@ -337,7 +337,7 @@ func (*OsFs) HasVirtualFolders() bool { func (fs *OsFs) GetFsPaths(sftpPath string) (string, string) { basePath := fs.rootDir virtualPath, mappedPath := fs.getMappedFolderForPath(sftpPath) - if len(mappedPath) > 0 { + if mappedPath != "" { basePath = mappedPath sftpPath = strings.TrimPrefix(utils.CleanPath(sftpPath), virtualPath) }