1 Star 0 Fork 18

zouweijian/grafana

forked from src-openEuler/grafana 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
003-fix-dashboard-abspath-test.patch 1.15 KB
一键复制 编辑 原始数据 按行查看 历史
wk333 提交于 2021-11-12 15:56 +08:00 . Upgrade to 7.5.11 for fix CVE-2021-39226
diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
index 3584bbc242..1a89767b69 100644
--- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
@@ -28,6 +28,7 @@ func TestProvisionedSymlinkedFolder(t *testing.T) {
}
want, err := filepath.Abs(containingID)
+ want, err = filepath.EvalSymlinks(want)
if err != nil {
t.Errorf("expected err to be nil")
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index 946d487d5f..2acef40eed 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -318,6 +318,7 @@ func TestDashboardFileReader(t *testing.T) {
}
absPath1, err := filepath.Abs(unprovision + "/dashboard1.json")
+ absPath1, err = filepath.EvalSymlinks(absPath1)
So(err, ShouldBeNil)
// This one does not exist on disk, simulating a deleted file
absPath2, err := filepath.Abs(unprovision + "/dashboard2.json")
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/bob-jianjian/grafana.git
git@gitee.com:bob-jianjian/grafana.git
bob-jianjian
grafana
grafana
openEuler-22.03-LTS-SP1

搜索帮助