瀏覽代碼

make path absolute before following symlink

bergquist 7 年之前
父節點
當前提交
2bd4c14e5f
共有 1 個文件被更改,包括 7 次插入6 次删除
  1. 7 6
      pkg/services/provisioning/dashboards/file_reader.go

+ 7 - 6
pkg/services/provisioning/dashboards/file_reader.go

@@ -47,20 +47,21 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
 		log.Error("Cannot read directory", "error", err)
 	}
 
-	path, err := filepath.EvalSymlinks(path)
+	copy := path
+	path, err := filepath.Abs(path)
 	if err != nil {
-		log.Error("Failed to read content of symlinked path: %s", path)
+		log.Error("Could not create absolute path ", "path", path)
+		path = copy //if .Abs return an error we fallback to path
 	}
 
-	absPath, err := filepath.Abs(path)
+	path, err = filepath.EvalSymlinks(path)
 	if err != nil {
-		log.Error("Could not create absolute path ", "path", path)
-		absPath = path //if .Abs return an error we fallback to path
+		log.Error("Failed to read content of symlinked path: %s", path)
 	}
 
 	return &fileReader{
 		Cfg:              cfg,
-		Path:             absPath,
+		Path:             path,
 		log:              log,
 		dashboardService: dashboards.NewProvisioningService(),
 	}, nil