Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1560 from zhulongcheng/before-validation 

fix(http/task): add validation for beforeTime/afterTime params
pull/10616/head
Mark Rushakoff 2018-11-29 06:35:03 -08:00 committed by GitHub
parent 8279ba65c3 45ec2265ac
commit 0a96f67cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
http/task_service.go
View File

@ -560,14 +560,26 @@ func decodeGetRunsRequest(ctx context.Context, r *http.Request, orgs platform.Or
req.filter.Limit = i req.filter.Limit = i
} }
if time := qp.Get("afterTime"); time != "" { var at, bt string
// TODO (jm): verify valid RFC3339 var afterTime, beforeTime time.Time
req.filter.AfterTime = time if at = qp.Get("afterTime"); at != "" {
afterTime, err = time.Parse(time.RFC3339, at)
if err != nil {
return nil, err
}
req.filter.AfterTime = at
} }
if time := qp.Get("beforeTime"); time != "" { if bt = qp.Get("beforeTime"); bt != "" {
// TODO (jm): verify valid RFC3339 beforeTime, err = time.Parse(time.RFC3339, bt)
req.filter.BeforeTime = time if err != nil {
return nil, err
}
req.filter.BeforeTime = bt
}
if at != "" && bt != "" && !beforeTime.After(afterTime) {
return nil, kerrors.InvalidDataf("beforeTime must be later than afterTime")
} }
return req, nil return req, nil