"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
ftp: make TLS config default to global TLS config - Fixes #6671
Nick Craig-Woode7a2b322ecc3
diff --git a/backend/ftp/ftp.go b/backend/ftp/ftp.goindex aedc3ea42..2c0617911 100644--- a/backend/ftp/ftp.go+++ b/backend/ftp/ftp.go@@ -283,6 +283,7 @@ type Fs struct {user stringpass stringdialAddr string+ tlsConf *tls.Config // default TLS client configpoolMu sync.Mutexpool []*ftp.ServerConndrain *time.Timer // used to drain the pool when we stop using the connections@@ -408,9 +409,14 @@ func shouldRetry(ctx context.Context, err error) (bool, error) {func (f *Fs) tlsConfig() *tls.Config {var tlsConfig *tls.Configif f.opt.TLS || f.opt.ExplicitTLS {- tlsConfig = &tls.Config{- ServerName: f.opt.Host,- InsecureSkipVerify: f.opt.SkipVerifyTLSCert,+ if f.tlsConf != nil {+ tlsConfig = f.tlsConf.Clone()+ } else {+ tlsConfig = new(tls.Config)+ }+ tlsConfig.ServerName = f.opt.Host+ if f.opt.SkipVerifyTLSCert {+ tlsConfig.InsecureSkipVerify = true}if f.opt.TLSCacheSize > 0 {tlsConfig.ClientSessionCache = tls.NewLRUClientSessionCache(f.opt.TLSCacheSize)@@ -671,6 +677,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (ff fs.FsdialAddr: dialAddr,tokens: pacer.NewTokenDispenser(opt.Concurrency),pacer: fs.NewPacer(ctx, pacer.NewDefault(pacer.MinSleep(minSleep), pacer.MaxSleep(maxSleep), pacer.DecayConstant(decayConstant))),+ tlsConf: fshttp.NewTransport(ctx).TLSClientConfig,}f.features = (&fs.Features{CanHaveEmptyDirectories: true,diff --git a/docs/content/ftp.md b/docs/content/ftp.mdindex 443877441..2afb024d4 100644--- a/docs/content/ftp.md+++ b/docs/content/ftp.md@@ -134,6 +134,35 @@ be enabled in the FTP backend config for the remote, or with[`--ftp-tls`](#ftp-tls). The default FTPS port is `990`, not `21` andcan be set with [`--ftp-port`](#ftp-port).+## TLS Options++TLS options for Implicit and Explicit TLS can be set using the+following flags which are specific to the FTP backend:++```+--ftp-no-check-certificate Do not verify the TLS certificate of the server+--ftp-disable-tls13 Disable TLS 1.3 (workaround for FTP servers with buggy TLS)+--ftp-tls-cache-size int Size of TLS session cache for all control and data connections (default 32)+```++However any of the global TLS flags can also be used such as:++```+--ca-cert stringArray CA certificate used to verify servers+--client-cert string Client SSL certificate (PEM) for mutual TLS auth+--client-key string Client SSL private key (PEM) for mutual TLS auth+--no-check-certificate Do not verify the server SSL certificate (insecure)+```++If these need to be put in the config file so they apply to just the+FTP backend then use the `override` syntax, eg++```+override.ca_cert = XXX+override.client_cert = XXX+override.client_key = XXX+```+### Restricted filename charactersIn addition to the [default restricted characters set](/overview/#restricted-characters)