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

fix(folders): add a circuit breaker to prevent infinite loops (#113596)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-11-07 14:32:17 +00:00
committed by GitHub
parent 8b6cc211e9
commit 305ed25896
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/unifiedstore.go
+11 -2
View File
@@ -388,7 +388,9 @@ func (ss *FolderUnifiedStoreImpl) GetFolders(ctx context.Context, q folder.GetFo
}
if (q.WithFullpath || q.WithFullpathUIDs) && f.Fullpath == "" {
buildFolderFullPaths(f, relations, folderMap)
if err := buildFolderFullPaths(f, relations, folderMap); err != nil {
return nil, err
}
}
hits = append(hits, f)
@@ -559,15 +561,21 @@ func computeFullPath(parents []*folder.Folder) (string, string) {
return strings.Join(fullpath, "/"), strings.Join(fullpathUIDs, "/")
}
func buildFolderFullPaths(f *folder.Folder, relations map[string]string, folderMap map[string]*folder.Folder) {
func buildFolderFullPaths(f *folder.Folder, relations map[string]string, folderMap map[string]*folder.Folder) error {
titles := make([]string, 0)
uids := make([]string, 0)
titles = append(titles, f.Title)
uids = append(uids, f.UID)
i := 0
currentUID := f.UID
for currentUID != "" {
// This is just a circuit breaker to prevent infinite loops. We should never reach this limit.
if i > 1000 {
return fmt.Errorf("folder depth exceeds the maximum allowed depth, You might have a circular reference")
}
i++
parentUID, exists := relations[currentUID]
if !exists {
break
@@ -588,6 +596,7 @@ func buildFolderFullPaths(f *folder.Folder, relations map[string]string, folderM
f.Fullpath = strings.Join(util.Reverse(titles), "/")
f.FullpathUIDs = strings.Join(util.Reverse(uids), "/")
return nil
}
func shouldSkipFolder(f *folder.Folder, filterUIDs map[string]struct{}) bool {
pkg/services/folder/folderimpl/unifiedstore_test.go
+1 -1
View File
@@ -881,7 +881,7 @@ func TestBuildFolderFullPaths(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
buildFolderFullPaths(tt.args.f, tt.args.relations, tt.args.folderMap)
require.NoError(t, buildFolderFullPaths(tt.args.f, tt.args.relations, tt.args.folderMap))
require.Equal(t, tt.want.Fullpath, tt.args.f.Fullpath, "BuildFolderFullPaths() = %v, want %v", tt.args.f.Fullpath, tt.want.Fullpath)
require.Equal(t, tt.want.FullpathUIDs, tt.args.f.FullpathUIDs, "BuildFolderFullPaths() = %v, want %v", tt.args.f.FullpathUIDs, tt.want.FullpathUIDs)
require.Equal(t, tt.want.Title, tt.args.f.Title, "BuildFolderFullPaths() = %v, want %v", tt.args.f.Title, tt.want.Title)