From 81ec7337e0021d76aa6bf917b3c547c798b45567 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Mon, 2 Nov 2015 14:53:34 +0100 Subject: [PATCH 1/3] Always use forward slashes in SFTP (Fixes #334) Add custom Join func that always uses forward slashes in SFTP --- backend/sftp/sftp.go | 59 ++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go index c904bf4bc..2bb74a97f 100644 --- a/backend/sftp/sftp.go +++ b/backend/sftp/sftp.go @@ -10,6 +10,7 @@ import ( "os/exec" "path/filepath" "sort" + "strings" "github.com/juju/errors" "github.com/pkg/sftp" @@ -74,12 +75,12 @@ func Open(dir string, program string, args ...string) (*SFTP, error) { // test if all necessary dirs and files are there items := []string{ dir, - filepath.Join(dir, backend.Paths.Data), - filepath.Join(dir, backend.Paths.Snapshots), - filepath.Join(dir, backend.Paths.Index), - filepath.Join(dir, backend.Paths.Locks), - filepath.Join(dir, backend.Paths.Keys), - filepath.Join(dir, backend.Paths.Temp), + Join(dir, backend.Paths.Data), + Join(dir, backend.Paths.Snapshots), + Join(dir, backend.Paths.Index), + Join(dir, backend.Paths.Locks), + Join(dir, backend.Paths.Keys), + Join(dir, backend.Paths.Temp), } for _, d := range items { if _, err := sftp.c.Lstat(d); err != nil { @@ -101,16 +102,16 @@ func Create(dir string, program string, args ...string) (*SFTP, error) { dirs := []string{ dir, - filepath.Join(dir, backend.Paths.Data), - filepath.Join(dir, backend.Paths.Snapshots), - filepath.Join(dir, backend.Paths.Index), - filepath.Join(dir, backend.Paths.Locks), - filepath.Join(dir, backend.Paths.Keys), - filepath.Join(dir, backend.Paths.Temp), + Join(dir, backend.Paths.Data), + Join(dir, backend.Paths.Snapshots), + Join(dir, backend.Paths.Index), + Join(dir, backend.Paths.Locks), + Join(dir, backend.Paths.Keys), + Join(dir, backend.Paths.Temp), } // test if config file already exists - _, err = sftp.c.Lstat(filepath.Join(dir, backend.Paths.Config)) + _, err = sftp.c.Lstat(dir + backend.Paths.Config) if err == nil { return nil, errors.New("config file already exists") } @@ -154,7 +155,7 @@ func (r *SFTP) tempFile() (string, *sftp.File, error) { } // construct tempfile name - name := filepath.Join(r.p, backend.Paths.Temp, "temp-"+hex.EncodeToString(buf)) + name := Join(r.p, backend.Paths.Temp, "temp-"+hex.EncodeToString(buf)) // create file in temp dir f, err := r.c.Create(name) @@ -286,13 +287,33 @@ func (r *SFTP) Create() (backend.Blob, error) { return &blob, nil } +func Join(parts ...string) string { + if len(parts) == 0 { + return "" + } + + result := strings.TrimRight(parts[0], "/") + if len(parts) == 1 { + return result + } + + for _, s := range parts[1:] { + s = strings.TrimRight(s, "/") + if len(s) == 0 { + continue + } + result = result + "/" + s + } + return result +} + // Construct path for given backend.Type and name. func (r *SFTP) filename(t backend.Type, name string) string { if t == backend.Config { - return filepath.Join(r.p, "config") + return Join(r.p + "config") } - return filepath.Join(r.dirname(t, name), name) + return Join(r.dirname(t, name), name) } // Construct directory for given backend.Type. @@ -302,7 +323,7 @@ func (r *SFTP) dirname(t backend.Type, name string) string { case backend.Data: n = backend.Paths.Data if len(name) > 2 { - n = filepath.Join(n, name[:2]) + n = Join(n, name[:2]) } case backend.Snapshot: n = backend.Paths.Snapshots @@ -313,7 +334,7 @@ func (r *SFTP) dirname(t backend.Type, name string) string { case backend.Key: n = backend.Paths.Keys } - return filepath.Join(r.p, n) + return Join(r.p, n) } // Get returns a reader that yields the content stored under the given @@ -396,7 +417,7 @@ func (r *SFTP) List(t backend.Type, done <-chan struct{}) <-chan string { // read files for _, dir := range dirs { - entries, err := r.c.ReadDir(filepath.Join(basedir, dir)) + entries, err := r.c.ReadDir(Join(basedir, dir)) if err != nil { continue } From d09e6d5b0fed8e02dd61ca07dc904ef85131db04 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Tue, 3 Nov 2015 18:47:01 +0100 Subject: [PATCH 2/3] Fix missing Join calls --- backend/sftp/sftp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go index 2bb74a97f..a4abf94c0 100644 --- a/backend/sftp/sftp.go +++ b/backend/sftp/sftp.go @@ -111,7 +111,7 @@ func Create(dir string, program string, args ...string) (*SFTP, error) { } // test if config file already exists - _, err = sftp.c.Lstat(dir + backend.Paths.Config) + _, err = sftp.c.Lstat(Join(dir, backend.Paths.Config)) if err == nil { return nil, errors.New("config file already exists") } @@ -310,7 +310,7 @@ func Join(parts ...string) string { // Construct path for given backend.Type and name. func (r *SFTP) filename(t backend.Type, name string) string { if t == backend.Config { - return Join(r.p + "config") + return Join(r.p, "config") } return Join(r.dirname(t, name), name) From af960b9b407a66ed6bf0cfb70f6ad3f1a251ae52 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Tue, 3 Nov 2015 18:47:11 +0100 Subject: [PATCH 3/3] Simplify Implementation of Join --- backend/sftp/sftp.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go index a4abf94c0..4166bdb7f 100644 --- a/backend/sftp/sftp.go +++ b/backend/sftp/sftp.go @@ -288,23 +288,7 @@ func (r *SFTP) Create() (backend.Blob, error) { } func Join(parts ...string) string { - if len(parts) == 0 { - return "" - } - - result := strings.TrimRight(parts[0], "/") - if len(parts) == 1 { - return result - } - - for _, s := range parts[1:] { - s = strings.TrimRight(s, "/") - if len(s) == 0 { - continue - } - result = result + "/" + s - } - return result + return filepath.Clean(strings.Join(parts, "/")) } // Construct path for given backend.Type and name.