KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #335 from JaCoB1123/windowspathnames

Browse source 
Always use forward slashes in SFTP (Fixes #334)
This commit is contained in:
Alexander Neumann 2015-11-03 21:29:00 +01:00
commit 73e085ae23
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
backend/sftp/sftp.go
View file

@ -10,6 +10,7 @@ import (
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"sort" "sort"
"strings"
"github.com/juju/errors" "github.com/juju/errors"
"github.com/pkg/sftp" "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 // test if all necessary dirs and files are there
items := []string{ items := []string{
dir, dir,
filepath.Join(dir, backend.Paths.Data), Join(dir, backend.Paths.Data),
filepath.Join(dir, backend.Paths.Snapshots), Join(dir, backend.Paths.Snapshots),
filepath.Join(dir, backend.Paths.Index), Join(dir, backend.Paths.Index),
filepath.Join(dir, backend.Paths.Locks), Join(dir, backend.Paths.Locks),
filepath.Join(dir, backend.Paths.Keys), Join(dir, backend.Paths.Keys),
filepath.Join(dir, backend.Paths.Temp), Join(dir, backend.Paths.Temp),
} }
for _, d := range items { for _, d := range items {
if _, err := sftp.c.Lstat(d); err != nil { if _, err := sftp.c.Lstat(d); err != nil {
@ -101,16 +102,16 @@ func Create(dir string, program string, args ...string) (*SFTP, error) {
dirs := []string{ dirs := []string{
dir, dir,
filepath.Join(dir, backend.Paths.Data), Join(dir, backend.Paths.Data),
filepath.Join(dir, backend.Paths.Snapshots), Join(dir, backend.Paths.Snapshots),
filepath.Join(dir, backend.Paths.Index), Join(dir, backend.Paths.Index),
filepath.Join(dir, backend.Paths.Locks), Join(dir, backend.Paths.Locks),
filepath.Join(dir, backend.Paths.Keys), Join(dir, backend.Paths.Keys),
filepath.Join(dir, backend.Paths.Temp), Join(dir, backend.Paths.Temp),
} }
// test if config file already exists // test if config file already exists
_, err = sftp.c.Lstat(filepath.Join(dir, backend.Paths.Config)) _, err = sftp.c.Lstat(Join(dir, backend.Paths.Config))
if err == nil { if err == nil {
return nil, errors.New("config file already exists") return nil, errors.New("config file already exists")
} }
@ -154,7 +155,7 @@ func (r *SFTP) tempFile() (string, *sftp.File, error) {
} }
// construct tempfile name // 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 // create file in temp dir
f, err := r.c.Create(name) f, err := r.c.Create(name)
@ -286,13 +287,17 @@ func (r *SFTP) Create() (backend.Blob, error) {
return &blob, nil return &blob, nil
} }
func Join(parts ...string) string {
return filepath.Clean(strings.Join(parts, "/"))
}
// Construct path for given backend.Type and name. // Construct path for given backend.Type and name.
func (r *SFTP) filename(t backend.Type, name string) string { func (r *SFTP) filename(t backend.Type, name string) string {
if t == backend.Config { 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. // Construct directory for given backend.Type.
@ -302,7 +307,7 @@ func (r *SFTP) dirname(t backend.Type, name string) string {
case backend.Data: case backend.Data:
n = backend.Paths.Data n = backend.Paths.Data
if len(name) > 2 { if len(name) > 2 {
n = filepath.Join(n, name[:2]) n = Join(n, name[:2])
} }
case backend.Snapshot: case backend.Snapshot:
n = backend.Paths.Snapshots n = backend.Paths.Snapshots
@ -313,7 +318,7 @@ func (r *SFTP) dirname(t backend.Type, name string) string {
case backend.Key: case backend.Key:
n = backend.Paths.Keys 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 // Get returns a reader that yields the content stored under the given
@ -396,7 +401,7 @@ func (r *SFTP) List(t backend.Type, done <-chan struct{}) <-chan string {
// read files // read files
for _, dir := range dirs { for _, dir := range dirs {
entries, err := r.c.ReadDir(filepath.Join(basedir, dir)) entries, err := r.c.ReadDir(Join(basedir, dir))
if err != nil { if err != nil {
continue continue
} }