From 5005a38227266323912ab7e265686dc1d3561182 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 16 Feb 2020 20:26:48 +0100 Subject: [PATCH] fix: clean file path. --- cmd/kv.go | 3 ++- dumper/file/file.go | 5 +++-- integrationtest/loader.go | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/kv.go b/cmd/kv.go index 0800a6e..963e2d0 100644 --- a/cmd/kv.go +++ b/cmd/kv.go @@ -6,6 +6,7 @@ import ( "fmt" "io/ioutil" "os" + "path/filepath" "time" "github.com/abronan/valkeyrie/store" @@ -125,7 +126,7 @@ func getCAContent(ca string) ([]byte, error) { return []byte(ca), nil } - caContent, err := ioutil.ReadFile(ca) + caContent, err := ioutil.ReadFile(filepath.Clean(ca)) if err != nil { return nil, err } diff --git a/dumper/file/file.go b/dumper/file/file.go index 5b4b58e..574981c 100644 --- a/dumper/file/file.go +++ b/dumper/file/file.go @@ -9,6 +9,7 @@ import ( "io" "log" "os" + "path/filepath" "strings" "github.com/containous/traefik/v2/pkg/provider/acme" @@ -71,7 +72,7 @@ func dumpV2(acmeFile string, baseConfig *dumper.BaseConfig) error { } func readJSONFile(acmeFile string, data interface{}) error { - source, err := os.Open(acmeFile) + source, err := os.Open(filepath.Clean(acmeFile)) if err != nil { return fmt.Errorf("failed to open file %q: %w", acmeFile, err) } @@ -186,7 +187,7 @@ func manageRename(watcher *fsnotify.Watcher, event fsnotify.Event, acmeFile stri } func calculateHash(acmeFile string) ([]byte, error) { - file, err := os.Open(acmeFile) + file, err := os.Open(filepath.Clean(acmeFile)) if err != nil { return nil, err } diff --git a/integrationtest/loader.go b/integrationtest/loader.go index e4dd4b8..34a779a 100644 --- a/integrationtest/loader.go +++ b/integrationtest/loader.go @@ -5,6 +5,7 @@ import ( "compress/gzip" "io/ioutil" "log" + "path/filepath" "time" "github.com/abronan/valkeyrie" @@ -91,7 +92,7 @@ func putData(backend store.Backend, addrs []string, content []byte) error { } func readFile(source string) ([]byte, error) { - content, err := ioutil.ReadFile(source) + content, err := ioutil.ReadFile(filepath.Clean(source)) if err != nil { return nil, err }