johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

console: rely on validator to check input values

Browse Source
This commit is contained in:
Vincent Bernat
2022-05-21 22:47:19 +02:00
parent 1a5efd30cb
commit fb7c51653f
3 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
console/graph.go
View File

@@ -15,11 +15,11 @@ import (
// graphQuery describes the input for the /graph endpoint.
type graphQuery struct {
Start time.Time `json:"start" binding:"required"`
End time.Time `json:"end" binding:"required"`
Points int `json:"points" binding:"required"` // minimum number of points
Dimensions []queryColumn `json:"dimensions"` // group by ...
Limit int `json:"limit"` // limit product of dimensions
Filter queryFilter `json:"filter"` // where ...
End time.Time `json:"end" binding:"required,gtfield=Start"`
Points int `json:"points" binding:"required,min=5,max=2000"` // minimum number of points
Dimensions []queryColumn `json:"dimensions"` // group by ...
Limit int `json:"limit" binding:"isdefault|min=1,max=50"` // limit product of dimensions
Filter queryFilter `json:"filter"` // where ...
}
// graphQueryToSQL converts a graph query to an SQL request
@@ -96,21 +96,6 @@ func (c *Component) graphHandlerFunc(gc *gin.Context) {
gc.JSON(http.StatusBadRequest, gin.H{"message": helpers.Capitalize(err.Error())})
return
}
if query.Start.After(query.End) {
gc.JSON(http.StatusBadRequest, gin.H{"message": "Start should not be after end"})
return
}
if query.Points < 5 || query.Points > 2000 {
gc.JSON(http.StatusBadRequest, gin.H{"message": "Points should be >= 5 and <= 2000"})
return
}
if query.Limit == 0 {
query.Limit = 10
}
if query.Limit < 5 || query.Limit > 50 {
gc.JSON(http.StatusBadRequest, gin.H{"message": "Limit should be >= 5 and <= 50"})
return
}
sqlQuery, err := query.toSQL()
if err != nil {