MirrorSave
/
rclone
mirror of https://github.com/rclone/rclone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

webdav: fix config parsing so --webdav-user and --webdav-pass flags work

This commit is contained in:
Nick Craig-Wood 2018-11-17 13:14:54 +00:00
parent 141c133818
commit 8c8dcdd521
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/webdav/webdav.go
View File

@ -31,7 +31,6 @@ import (
"github.com/ncw/rclone/backend/webdav/api" "github.com/ncw/rclone/backend/webdav/api"
"github.com/ncw/rclone/backend/webdav/odrvcookie" "github.com/ncw/rclone/backend/webdav/odrvcookie"
"github.com/ncw/rclone/fs" "github.com/ncw/rclone/fs"
"github.com/ncw/rclone/fs/config"
"github.com/ncw/rclone/fs/config/configmap" "github.com/ncw/rclone/fs/config/configmap"
"github.com/ncw/rclone/fs/config/configstruct" "github.com/ncw/rclone/fs/config/configstruct"
"github.com/ncw/rclone/fs/config/obscure" "github.com/ncw/rclone/fs/config/obscure"
@ -96,10 +95,11 @@ func init() {
// Options defines the configuration for this backend // Options defines the configuration for this backend
type Options struct { type Options struct {
URL string `config:"url"` URL string `config:"url"`
Vendor string `config:"vendor"` Vendor string `config:"vendor"`
User string `config:"user"` User string `config:"user"`
Pass string `config:"pass"` Pass string `config:"pass"`
BearerToken string `config:"bearer_token"`
} }
// Fs represents a remote webdav // Fs represents a remote webdav
@ -283,9 +283,6 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
rootIsDir := strings.HasSuffix(root, "/") rootIsDir := strings.HasSuffix(root, "/")
root = strings.Trim(root, "/") root = strings.Trim(root, "/")
user := config.FileGet(name, "user")
pass := config.FileGet(name, "pass")
bearerToken := config.FileGet(name, "bearer_token")
if !strings.HasSuffix(opt.URL, "/") { if !strings.HasSuffix(opt.URL, "/") {
opt.URL += "/" opt.URL += "/"
} }
@ -320,10 +317,10 @@ func NewFs(name, root string, m configmap.Mapper) (fs.Fs, error) {
f.features = (&fs.Features{ f.features = (&fs.Features{
CanHaveEmptyDirectories: true, CanHaveEmptyDirectories: true,
}).Fill(f) }).Fill(f)
if user != "" || pass != "" { if opt.User != "" || opt.Pass != "" {
f.srv.SetUserPass(opt.User, opt.Pass) f.srv.SetUserPass(opt.User, opt.Pass)
} else if bearerToken != "" { } else if opt.BearerToken != "" {
f.srv.SetHeader("Authorization", "BEARER "+bearerToken) f.srv.SetHeader("Authorization", "BEARER "+opt.BearerToken)
} }
f.srv.SetErrorHandler(errorHandler) f.srv.SetErrorHandler(errorHandler)
err = f.setQuirks(opt.Vendor) err = f.setQuirks(opt.Vendor)