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

lint

Browse Source
This commit is contained in:
Malcolm Holmes
2021-12-07 15:04:55 +00:00
parent 3a560293c2
commit d2cccfe91e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/plugins.go
+2 -2
View File
@@ -265,7 +265,7 @@ func (hs *HTTPServer) getPluginAssets(c *models.ReqContext) {
} }
// prepend slash for cleaning relative paths // prepend slash for cleaning relative paths
requestedFile := filepath.Clean(filepath.Join("/",macaron.Params(c.Req)["*"])) requestedFile := filepath.Clean(filepath.Join("/", macaron.Params(c.Req)["*"]))
rel, err := filepath.Rel("/", requestedFile) rel, err := filepath.Rel("/", requestedFile)
if err != nil { if err != nil {
// slash is prepended above therefore this is not expected to fail // slash is prepended above therefore this is not expected to fail
@@ -283,7 +283,7 @@ func (hs *HTTPServer) getPluginAssets(c *models.ReqContext) {
c.JsonApiErr(500, "Failed to get plugin absolute path", nil) c.JsonApiErr(500, "Failed to get plugin absolute path", nil)
return return
} }
pluginFilePath := filepath.Join(absPluginDir, rel) pluginFilePath := filepath.Join(absPluginDir, rel)
// It's safe to ignore gosec warning G304 since we already clean the requested file path and subsequently // It's safe to ignore gosec warning G304 since we already clean the requested file path and subsequently
// use this with a prefix of the plugin's directory, which is set during plugin loading // use this with a prefix of the plugin's directory, which is set during plugin loading