From 8cc2dfe5c2373511bb7ce6577bed310b85c48f59 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Mon, 22 Feb 2021 16:27:45 +0100 Subject: [PATCH] update pkg/sftp we don't need my branch anymore now that all the required features for the sftpfs are available upstream too --- dataprovider/dataprovider.go | 20 -------------------- go.mod | 3 +-- go.sum | 5 +++-- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dataprovider/dataprovider.go b/dataprovider/dataprovider.go index af27493c..702c6534 100644 --- a/dataprovider/dataprovider.go +++ b/dataprovider/dataprovider.go @@ -2214,26 +2214,6 @@ func executeAction(operation string, user *User) { }() } -// after migrating database to v4 we have to update the quota for the imported folders -/*func updateVFoldersQuotaAfterRestore(foldersToScan []string) { - fs := vfs.NewOsFs("", "", nil).(*vfs.OsFs) - for _, folder := range foldersToScan { - providerLog(logger.LevelDebug, "starting quota scan after migration for folder %#v", folder) - vfolder, err := provider.getFolderByPath(folder) - if err != nil { - providerLog(logger.LevelWarn, "error getting folder to scan %#v: %v", folder, err) - continue - } - numFiles, size, err := fs.GetDirSize(folder) - if err != nil { - providerLog(logger.LevelWarn, "error scanning folder %#v: %v", folder, err) - continue - } - err = UpdateVirtualFolderQuota(vfolder, numFiles, size, true) - providerLog(logger.LevelDebug, "quota updated for virtual folder %#v, error: %v", vfolder.MappedPath, err) - } -}*/ - func updateWebDavCachedUserLastLogin(username string) { result, ok := webDAVUsersCache.Load(username) if ok { diff --git a/go.mod b/go.mod index 9b0494f6..4d88d855 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/otiai10/copy v1.4.2 github.com/pelletier/go-toml v1.8.1 // indirect github.com/pires/go-proxyproto v0.4.2 - github.com/pkg/sftp v1.12.1-0.20201128220914-b5b6f3393fe9 + github.com/pkg/sftp v1.12.1-0.20210222152308-b8102da57e75 github.com/prometheus/client_golang v1.9.0 github.com/prometheus/common v0.17.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect @@ -73,7 +73,6 @@ require ( replace ( github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 - github.com/pkg/sftp => github.com/drakkan/sftp v0.0.0-20210210202350-a2b46fc9c0d5 golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20210221212101-dc57d1956176 golang.org/x/net => github.com/drakkan/net v0.0.0-20210221212420-9117fa75ae3d ) diff --git a/go.sum b/go.sum index b3c6809c..813c4e85 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,6 @@ github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 h1:LPH1dEblAOO/LoG7yHP github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU= github.com/drakkan/net v0.0.0-20210221212420-9117fa75ae3d h1:VUM47Q+HId0s2Kr6Cx/Iej3V3JQHxw/C9FzMRlaicDc= github.com/drakkan/net v0.0.0-20210221212420-9117fa75ae3d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -github.com/drakkan/sftp v0.0.0-20210210202350-a2b46fc9c0d5 h1:jVxjoPrGY9Ypw65tTHRdDvumOE3ys2fLZfvFT6+gFPU= -github.com/drakkan/sftp v0.0.0-20210210202350-a2b46fc9c0d5/go.mod h1:fUqqXB5vEgVCZ131L+9say31RAri6aF6KDViawhxKK8= 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= @@ -569,6 +567,9 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.12.1-0.20210222152308-b8102da57e75 h1:M1mYcYovX5NYD+nZSSqligrmYg3lsiMBS0DycBpDjXY= +github.com/pkg/sftp v1.12.1-0.20210222152308-b8102da57e75/go.mod h1:41g+FIPlQUTDCveupEmEA65IoiQFrtgCeDopC4ajGIM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=