From aedab91a66f183d3b17d7a1526d0f2adf8a269c2 Mon Sep 17 00:00:00 2001 From: James Hartig Date: Fri, 12 Jan 2018 14:11:59 -0500 Subject: [PATCH] Resolve symlinks in config directory Docker/Openshift/Kubernetes mount the config file as a symbolic link and IsDir returns true if the file is a symlink. Before calling IsDir, the symlink should be resolved to determine if it points at a file or directory. Fixes #3753 --- agent/config/builder.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/agent/config/builder.go b/agent/config/builder.go index c6b3e47666..e5f3793f93 100644 --- a/agent/config/builder.go +++ b/agent/config/builder.go @@ -165,12 +165,25 @@ func (b *Builder) ReadPath(path string) ([]Source, error) { var sources []Source for _, fi := range fis { + fp := filepath.Join(path, fi.Name()) + // check for a symlink and resolve the path + if fi.Mode()&os.ModeSymlink > 0 { + var err error + fp, err = filepath.EvalSymlinks(fp) + if err != nil { + return nil, err + } + fi, err = os.Stat(fp) + if err != nil { + return nil, err + } + } // do not recurse into sub dirs if fi.IsDir() { continue } - src, err := b.ReadFile(filepath.Join(path, fi.Name())) + src, err := b.ReadFile(fp) if err != nil { return nil, err }