IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Storage: externalize allow_unsanitized_svg_upload (#52703)

Browse Source
This commit is contained in:
Artur Wierzbicki
2022-07-25 21:11:17 +04:00
committed by GitHub
parent 9c3f9887fc
commit 3cd43bd7ea
5 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/store/service.go
View File

@@ -194,9 +194,7 @@ func ProvideService(sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles,
}
})
return newStandardStorageService(sql, globalRoots, initializeOrgStorages, authService, storageServiceConfig{
allowUnsanitizedSvgUpload: false,
})
return newStandardStorageService(sql, globalRoots, initializeOrgStorages, authService, cfg)
}
func createSystemBrandingPathFilter() filestorage.PathFilter {
@@ -207,7 +205,7 @@ func createSystemBrandingPathFilter() filestorage.PathFilter {
nil)
}
func newStandardStorageService(sql *sqlstore.SQLStore, globalRoots []storageRuntime, initializeOrgStorages func(orgId int64) []storageRuntime, authService storageAuthService, cfg storageServiceConfig) *standardStorageService {
func newStandardStorageService(sql *sqlstore.SQLStore, globalRoots []storageRuntime, initializeOrgStorages func(orgId int64) []storageRuntime, authService storageAuthService, cfg *setting.Cfg) *standardStorageService {
rootsByOrgId := make(map[int64][]storageRuntime)
rootsByOrgId[ac.GlobalOrgID] = globalRoots
@@ -220,7 +218,9 @@ func newStandardStorageService(sql *sqlstore.SQLStore, globalRoots []storageRunt
sql: sql,
tree: res,
authService: authService,
cfg: cfg,
cfg: storageServiceConfig{
allowUnsanitizedSvgUpload: cfg.Storage.AllowUnsanitizedSvgUpload,
},
}
}