public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provisioning: turn relative symlinked path into absolut paths

Browse Source
This commit is contained in:
bergquist
2018-06-04 15:20:26 +02:00
parent f606654c50
commit d089b5e05d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/provisioning/dashboards/file_reader.go
+9
View File
@@ -48,16 +48,25 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
} }
copy := path copy := path
// get absolut path of config file
path, err := filepath.Abs(path) path, err := filepath.Abs(path)
if err != nil { if err != nil {
log.Error("Could not create absolute path ", "path", path) log.Error("Could not create absolute path ", "path", path)
} }
// follow the symlink to get the real path
path, err = filepath.EvalSymlinks(path) path, err = filepath.EvalSymlinks(path)
if err != nil { if err != nil {
log.Error("Failed to read content of symlinked path: %s", path) log.Error("Failed to read content of symlinked path: %s", path)
} }
// get the absolut path in case the symlink is relative
path, err = filepath.Abs(path)
if err != nil {
log.Error("Could not create absolute path ", "path", path)
}
if path == "" { if path == "" {
path = copy path = copy
log.Info("falling back to original path due to EvalSymlink/Abs failure") log.Info("falling back to original path due to EvalSymlink/Abs failure")