RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-16 18:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate API input

Browse Source
This commit is contained in:
Fabian Reinartz 2015-12-09 18:21:06 +01:00
parent 33506d7257
commit a2b8d35733
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
api.go
View File

@ -184,39 +184,23 @@ func (api *API) legacyAddAlerts(w http.ResponseWriter, r *http.Request) {
alerts = append(alerts, a)
}
now := time.Now()
for _, alert := range alerts {
alert.UpdatedAt = now
if alert.StartsAt.IsZero() {
alert.StartsAt = now
}
if alert.EndsAt.IsZero() {
alert.Timeout = true
alert.EndsAt = alert.StartsAt.Add(api.resolveTimeout)
}
}
// TODO(fabxc): validate input.
if err := api.alerts.Put(alerts...); err != nil {
respondError(w, apiError{
typ: errorInternal,
err: err,
}, nil)
return
}
respond(w, nil)
api.insertAlerts(w, r, alerts...)
}
func (api *API) addAlerts(w http.ResponseWriter, r *http.Request) {
var alerts []*types.Alert
if err := receive(r, &alerts); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
respondError(w, apiError{
typ: errorBadData,
err: err,
}, nil)
return
}
api.insertAlerts(w, r, alerts...)
}
func (api *API) insertAlerts(w http.ResponseWriter, r *http.Request, alerts ...*types.Alert) {
now := time.Now()
for _, alert := range alerts {
@ -231,7 +215,17 @@ func (api *API) addAlerts(w http.ResponseWriter, r *http.Request) {
}
}
// TODO(fabxc): validate input.
// Only validate after we've ensured that StartsAt is set.
for _, a := range alerts {
if err := a.Validate(); err != nil {
respondError(w, apiError{
typ: errorBadData,
err: err,
}, nil)
return
}
}
if err := api.alerts.Put(alerts...); err != nil {
respondError(w, apiError{
typ: errorInternal,
@ -254,7 +248,14 @@ func (api *API) addSilence(w http.ResponseWriter, r *http.Request) {
sil.CreatedAt = time.Now()
}
// TODO(fabxc): validate input.
if err := sil.Validate(); err != nil {
respondError(w, apiError{
typ: errorBadData,
err: err,
}, nil)
return
}
sid, err := api.silences.Set(&sil)
if err != nil {
respondError(w, apiError{
@ -279,6 +280,7 @@ func (api *API) getSilence(w http.ResponseWriter, r *http.Request) {
typ: errorBadData,
err: err,
}, nil)
return
}
sil, err := api.silences.Get(sid)
@ -298,6 +300,7 @@ func (api *API) delSilence(w http.ResponseWriter, r *http.Request) {
typ: errorBadData,
err: err,
}, nil)
return
}
if err := api.silences.Del(sid); err != nil {

3
test/mock.go
View File

@ -107,6 +107,9 @@ func (s *TestSilence) nativeSilence(opts *AcceptanceOpts) *model.Silence {
if s.endsAt > 0 {
nsil.EndsAt = opts.expandTime(s.endsAt)
}
nsil.Comment = "some comment"
nsil.CreatedBy = "admin@example.com"
return nsil
}