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

Merge branch 'webhook-improvements' of https://github.com/jonathanrbarney/statping-ng into webhook-improvements

pull/1081/head
Jonathan Barney 2021-08-18 07:35:30 -07:00
parent 2516aacc96 fafe3ee196
commit 060a9f079c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
notifiers/webhook.go
View File

@ -86,15 +86,30 @@ func (w *webhooker) Valid(values notifications.Values) error {
} }
func (w *webhooker) sendHttpWebhook(body string) (*http.Response, error) { func (w *webhooker) sendHttpWebhook(body string) (*http.Response, error) {
utils.Log.Infoln(fmt.Sprintf("sending body: '%v' to %v as a %v request", body, w.Host.String, w.Var1.String))
client := new(http.Client) client := new(http.Client)
client.Timeout = 10 * time.Second client.Timeout = 10 * time.Second
req, err := http.NewRequest(w.Var1.String, w.Host.String, bytes.NewBufferString(body)) req, err := http.NewRequest(w.Var1.String, w.Host.String, bytes.NewBufferString(body))
if err != nil { if err != nil {
return nil, err return nil, err
} }
if w.ApiKey.String != "" {
req.Header.Add("Content-Type", w.ApiKey.String)
} else {
req.Header.Add("Content-Type", "application/json")
}
req.Header.Set("User-Agent", "Statping")
req.Header.Set("Statping-Version", utils.Params.GetString("VERSION"))
var customHeaders []string
if w.ApiSecret.String != "" { if w.ApiSecret.String != "" {
keyVal := strings.SplitN(w.ApiSecret.String, "=", 2) customHeaders = strings.Split(w.ApiSecret.String, ",")
} else {
customHeaders = nil
}
for _, h := range customHeaders {
keyVal := strings.SplitN(h, "=", 2)
if len(keyVal) == 2 { if len(keyVal) == 2 {
if keyVal[0] != "" && keyVal[1] != "" { if keyVal[0] != "" && keyVal[1] != "" {
if strings.ToLower(keyVal[0]) == "host" { if strings.ToLower(keyVal[0]) == "host" {
@ -105,13 +120,8 @@ func (w *webhooker) sendHttpWebhook(body string) (*http.Response, error) {
} }
} }
} }
if w.ApiKey.String != "" {
req.Header.Add("Content-Type", w.ApiKey.String) utils.Log.Infoln(fmt.Sprintf("sending body: '%v' to %v as a %v request with headers: '%v'", body, w.Host.String, w.Var1.String, req.Header))
} else {
req.Header.Add("Content-Type", "application/json")
}
req.Header.Set("User-Agent", "Statping")
req.Header.Set("Statping-Version", utils.Params.GetString("VERSION"))
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err