apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

API: Do not expose user input in datasource error responses (#53483)

Browse Source
pull/54622/head^2
Sofia Papagiannaki 3 years ago committed by GitHub
parent 11de1dfe40
commit 950715b255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      pkg/api/datasources.go

6
pkg/api/datasources.go
Unescape View File

@ -107,7 +107,7 @@ func (hs *HTTPServer) GetDataSources(c *models.ReqContext) response.Response {
func (hs *HTTPServer) GetDataSourceById(c *models.ReqContext) response.Response { func (hs *HTTPServer) GetDataSourceById(c *models.ReqContext) response.Response {
id, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64) id, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64)
if err != nil { if err != nil {
return response.Error(http.StatusBadRequest, "id is invalid", err) return response.Error(http.StatusBadRequest, "id is invalid", nil)
} }
query := datasources.GetDataSourceQuery{ query := datasources.GetDataSourceQuery{
Id: id, Id: id,
@ -605,7 +605,7 @@ func (hs *HTTPServer) GetDataSourceIdByName(c *models.ReqContext) response.Respo
func (hs *HTTPServer) CallDatasourceResource(c *models.ReqContext) { func (hs *HTTPServer) CallDatasourceResource(c *models.ReqContext) {
datasourceID, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64) datasourceID, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64)
if err != nil { if err != nil {
c.JsonApiErr(http.StatusBadRequest, "id is invalid", err) c.JsonApiErr(http.StatusBadRequest, "id is invalid", nil)
return return
} }
ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache) ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache)
@ -742,7 +742,7 @@ func (hs *HTTPServer) CheckDatasourceHealthWithUID(c *models.ReqContext) respons
func (hs *HTTPServer) CheckDatasourceHealth(c *models.ReqContext) response.Response { func (hs *HTTPServer) CheckDatasourceHealth(c *models.ReqContext) response.Response {
datasourceID, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64) datasourceID, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64)
if err != nil { if err != nil {
return response.Error(http.StatusBadRequest, "id is invalid", err) return response.Error(http.StatusBadRequest, "id is invalid", nil)
} }
ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache) ds, err := hs.DataSourceCache.GetDatasource(c.Req.Context(), datasourceID, c.SignedInUser, c.SkipCache)

Write Preview
Loading…
Cancel
Save