Merge branch 'cursor/webhook-presets-65da' into 'master'
Webhook-formulier per preset See merge request Timfa/bluegit!7
@@ -356,4 +356,39 @@ var en = map[string]string{
356
356
"err.tagFail": "tag: %s",
357
357
"err.json": "invalid json",
358
358
"commit.pushedBy": "pushed by %s",
359
360
"set.preset.custom": "No preset",
361
"set.preset.slack": "Slack",
362
"set.preset.teams": "Microsoft Teams",
363
"set.preset.mattermost": "Mattermost",
364
"set.preset.rocketchat": "Rocket.Chat",
365
"set.preset.telegram": "Telegram",
366
"set.preset.matrix": "Matrix",
367
"set.preset.googlechat": "Google Chat",
368
"set.preset.ntfy": "ntfy",
369
"set.preset.gotify": "Gotify",
370
"wh.webhookURL": "Webhook URL",
371
"wh.url": "URL",
372
"wh.username": "Username",
373
"wh.avatar": "Avatar URL",
374
"wh.icon": "Icon URL",
375
"wh.alias": "Alias",
376
"wh.token": "Secret",
377
"wh.tokenHint": "Name of a secret, for example BOT_TOKEN.",
378
"wh.chat": "Chat ID",
379
"wh.server": "Server",
380
"wh.topic": "Topic",
381
"wh.homeserver": "Homeserver",
382
"wh.room": "Room",
383
"wh.method": "Method",
384
"wh.contentType": "Content type",
385
"wh.headers": "Headers",
386
"wh.headerHint": "One header per line. A value may refer to a secret as {{secret.NAME}}.",
387
"wh.body": "Body template",
388
"wh.bodyHint": "Optional. Empty sends the event as JSON.",
389
"err.whTopic": "topic is invalid",
390
"err.whChat": "chat ID is invalid",
391
"err.whRoom": "room is invalid",
392
"err.whServer": "server URL is missing",
393
"err.whMethod": "method must be GET, POST, PUT or PATCH",
359
394
}
@@ -356,4 +356,39 @@ var en = map[string]string{356
"err.tagFail": "tag: %s",356
"err.tagFail": "tag: %s",357
"err.json": "invalid json",357
"err.json": "invalid json",358
"commit.pushedBy": "pushed by %s",358
"commit.pushedBy": "pushed by %s",359
360
"set.preset.custom": "No preset",361
"set.preset.slack": "Slack",362
"set.preset.teams": "Microsoft Teams",363
"set.preset.mattermost": "Mattermost",364
"set.preset.rocketchat": "Rocket.Chat",365
"set.preset.telegram": "Telegram",366
"set.preset.matrix": "Matrix",367
"set.preset.googlechat": "Google Chat",368
"set.preset.ntfy": "ntfy",369
"set.preset.gotify": "Gotify",370
"wh.webhookURL": "Webhook URL",371
"wh.url": "URL",372
"wh.username": "Username",373
"wh.avatar": "Avatar URL",374
"wh.icon": "Icon URL",375
"wh.alias": "Alias",376
"wh.token": "Secret",377
"wh.tokenHint": "Name of a secret, for example BOT_TOKEN.",378
"wh.chat": "Chat ID",379
"wh.server": "Server",380
"wh.topic": "Topic",381
"wh.homeserver": "Homeserver",382
"wh.room": "Room",383
"wh.method": "Method",384
"wh.contentType": "Content type",385
"wh.headers": "Headers",386
"wh.headerHint": "One header per line. A value may refer to a secret as {{secret.NAME}}.",387
"wh.body": "Body template",388
"wh.bodyHint": "Optional. Empty sends the event as JSON.",389
"err.whTopic": "topic is invalid",390
"err.whChat": "chat ID is invalid",391
"err.whRoom": "room is invalid",392
"err.whServer": "server URL is missing",393
"err.whMethod": "method must be GET, POST, PUT or PATCH",359
}394
}@@ -353,6 +353,41 @@ var nl = map[string]string{
353
353
"err.tagFail": "tag: %s",
354
354
"err.json": "json",
355
355
"commit.pushedBy": "gepusht door %s",
356
357
"set.preset.custom": "Geen preset",
358
"set.preset.slack": "Slack",
359
"set.preset.teams": "Microsoft Teams",
360
"set.preset.mattermost": "Mattermost",
361
"set.preset.rocketchat": "Rocket.Chat",
362
"set.preset.telegram": "Telegram",
363
"set.preset.matrix": "Matrix",
364
"set.preset.googlechat": "Google Chat",
365
"set.preset.ntfy": "ntfy",
366
"set.preset.gotify": "Gotify",
367
"wh.webhookURL": "Webhook-URL",
368
"wh.url": "URL",
369
"wh.username": "Gebruikersnaam",
370
"wh.avatar": "Avatar-URL",
371
"wh.icon": "Pictogram-URL",
372
"wh.alias": "Alias",
373
"wh.token": "Geheim",
374
"wh.tokenHint": "Naam van een geheim, bijvoorbeeld BOT_TOKEN.",
375
"wh.chat": "Chat-ID",
376
"wh.server": "Server",
377
"wh.topic": "Onderwerp",
378
"wh.homeserver": "Homeserver",
379
"wh.room": "Kamer",
380
"wh.method": "Methode",
381
"wh.contentType": "Content-type",
382
"wh.headers": "Headers",
383
"wh.headerHint": "Eén header per regel. Een waarde mag naar een geheim verwijzen als {{secret.NAME}}.",
384
"wh.body": "Body-sjabloon",
385
"wh.bodyHint": "Optioneel. Leeg stuurt de gebeurtenis als JSON.",
386
"err.whTopic": "onderwerp is ongeldig",
387
"err.whChat": "chat-ID is ongeldig",
388
"err.whRoom": "kamer is ongeldig",
389
"err.whServer": "server-URL ontbreekt",
390
"err.whMethod": "methode moet GET, POST, PUT of PATCH zijn",
356
391
}
357
392
358
393
var de = map[string]string{
@@ -708,6 +743,41 @@ var de = map[string]string{
708
743
"err.tagFail": "Tag: %s",
709
744
"err.json": "json",
710
745
"commit.pushedBy": "gepusht von %s",
746
747
"set.preset.custom": "Keine Vorlage",
748
"set.preset.slack": "Slack",
749
"set.preset.teams": "Microsoft Teams",
750
"set.preset.mattermost": "Mattermost",
751
"set.preset.rocketchat": "Rocket.Chat",
752
"set.preset.telegram": "Telegram",
753
"set.preset.matrix": "Matrix",
754
"set.preset.googlechat": "Google Chat",
755
"set.preset.ntfy": "ntfy",
756
"set.preset.gotify": "Gotify",
757
"wh.webhookURL": "Webhook-URL",
758
"wh.url": "URL",
759
"wh.username": "Benutzername",
760
"wh.avatar": "Avatar-URL",
761
"wh.icon": "Symbol-URL",
762
"wh.alias": "Alias",
763
"wh.token": "Geheimnis",
764
"wh.tokenHint": "Name eines Geheimnisses, zum Beispiel BOT_TOKEN.",
765
"wh.chat": "Chat-ID",
766
"wh.server": "Server",
767
"wh.topic": "Thema",
768
"wh.homeserver": "Homeserver",
769
"wh.room": "Raum",
770
"wh.method": "Methode",
771
"wh.contentType": "Content-Type",
772
"wh.headers": "Header",
773
"wh.headerHint": "Ein Header pro Zeile. Ein Wert darf ein Geheimnis als {{secret.NAME}} nennen.",
774
"wh.body": "Body-Vorlage",
775
"wh.bodyHint": "Optional. Leer sendet das Ereignis als JSON.",
776
"err.whTopic": "Thema ist ungültig",
777
"err.whChat": "Chat-ID ist ungültig",
778
"err.whRoom": "Raum ist ungültig",
779
"err.whServer": "Server-URL fehlt",
780
"err.whMethod": "Methode muss GET, POST, PUT oder PATCH sein",
711
781
}
712
782
713
783
var fr = map[string]string{
@@ -1063,4 +1133,39 @@ var fr = map[string]string{
1063
1133
"err.tagFail": "tag : %s",
1064
1134
"err.json": "json",
1065
1135
"commit.pushedBy": "poussé par %s",
1136
1137
"set.preset.custom": "Aucun modèle",
1138
"set.preset.slack": "Slack",
1139
"set.preset.teams": "Microsoft Teams",
1140
"set.preset.mattermost": "Mattermost",
1141
"set.preset.rocketchat": "Rocket.Chat",
1142
"set.preset.telegram": "Telegram",
1143
"set.preset.matrix": "Matrix",
1144
"set.preset.googlechat": "Google Chat",
1145
"set.preset.ntfy": "ntfy",
1146
"set.preset.gotify": "Gotify",
1147
"wh.webhookURL": "URL du webhook",
1148
"wh.url": "URL",
1149
"wh.username": "Nom d’utilisateur",
1150
"wh.avatar": "URL de l’avatar",
1151
"wh.icon": "URL de l’icône",
1152
"wh.alias": "Alias",
1153
"wh.token": "Secret",
1154
"wh.tokenHint": "Nom d’un secret, par exemple BOT_TOKEN.",
1155
"wh.chat": "Identifiant du chat",
1156
"wh.server": "Serveur",
1157
"wh.topic": "Sujet",
1158
"wh.homeserver": "Serveur d’accueil",
1159
"wh.room": "Salon",
1160
"wh.method": "Méthode",
1161
"wh.contentType": "Type de contenu",
1162
"wh.headers": "En-têtes",
1163
"wh.headerHint": "Un en-tête par ligne. Une valeur peut citer un secret sous la forme {{secret.NAME}}.",
1164
"wh.body": "Modèle du corps",
1165
"wh.bodyHint": "Facultatif. Vide envoie l’événement en JSON.",
1166
"err.whTopic": "sujet invalide",
1167
"err.whChat": "identifiant de chat invalide",
1168
"err.whRoom": "salon invalide",
1169
"err.whServer": "l’URL du serveur manque",
1170
"err.whMethod": "la méthode doit être GET, POST, PUT ou PATCH",
1066
1171
}
@@ -353,6 +353,41 @@ var nl = map[string]string{353
"err.tagFail": "tag: %s",353
"err.tagFail": "tag: %s",354
"err.json": "json",354
"err.json": "json",355
"commit.pushedBy": "gepusht door %s",355
"commit.pushedBy": "gepusht door %s",356
357
"set.preset.custom": "Geen preset",358
"set.preset.slack": "Slack",359
"set.preset.teams": "Microsoft Teams",360
"set.preset.mattermost": "Mattermost",361
"set.preset.rocketchat": "Rocket.Chat",362
"set.preset.telegram": "Telegram",363
"set.preset.matrix": "Matrix",364
"set.preset.googlechat": "Google Chat",365
"set.preset.ntfy": "ntfy",366
"set.preset.gotify": "Gotify",367
"wh.webhookURL": "Webhook-URL",368
"wh.url": "URL",369
"wh.username": "Gebruikersnaam",370
"wh.avatar": "Avatar-URL",371
"wh.icon": "Pictogram-URL",372
"wh.alias": "Alias",373
"wh.token": "Geheim",374
"wh.tokenHint": "Naam van een geheim, bijvoorbeeld BOT_TOKEN.",375
"wh.chat": "Chat-ID",376
"wh.server": "Server",377
"wh.topic": "Onderwerp",378
"wh.homeserver": "Homeserver",379
"wh.room": "Kamer",380
"wh.method": "Methode",381
"wh.contentType": "Content-type",382
"wh.headers": "Headers",383
"wh.headerHint": "Eén header per regel. Een waarde mag naar een geheim verwijzen als {{secret.NAME}}.",384
"wh.body": "Body-sjabloon",385
"wh.bodyHint": "Optioneel. Leeg stuurt de gebeurtenis als JSON.",386
"err.whTopic": "onderwerp is ongeldig",387
"err.whChat": "chat-ID is ongeldig",388
"err.whRoom": "kamer is ongeldig",389
"err.whServer": "server-URL ontbreekt",390
"err.whMethod": "methode moet GET, POST, PUT of PATCH zijn",356
}391
}357
392
358
var de = map[string]string{393
var de = map[string]string{@@ -708,6 +743,41 @@ var de = map[string]string{708
"err.tagFail": "Tag: %s",743
"err.tagFail": "Tag: %s",709
"err.json": "json",744
"err.json": "json",710
"commit.pushedBy": "gepusht von %s",745
"commit.pushedBy": "gepusht von %s",746
747
"set.preset.custom": "Keine Vorlage",748
"set.preset.slack": "Slack",749
"set.preset.teams": "Microsoft Teams",750
"set.preset.mattermost": "Mattermost",751
"set.preset.rocketchat": "Rocket.Chat",752
"set.preset.telegram": "Telegram",753
"set.preset.matrix": "Matrix",754
"set.preset.googlechat": "Google Chat",755
"set.preset.ntfy": "ntfy",756
"set.preset.gotify": "Gotify",757
"wh.webhookURL": "Webhook-URL",758
"wh.url": "URL",759
"wh.username": "Benutzername",760
"wh.avatar": "Avatar-URL",761
"wh.icon": "Symbol-URL",762
"wh.alias": "Alias",763
"wh.token": "Geheimnis",764
"wh.tokenHint": "Name eines Geheimnisses, zum Beispiel BOT_TOKEN.",765
"wh.chat": "Chat-ID",766
"wh.server": "Server",767
"wh.topic": "Thema",768
"wh.homeserver": "Homeserver",769
"wh.room": "Raum",770
"wh.method": "Methode",771
"wh.contentType": "Content-Type",772
"wh.headers": "Header",773
"wh.headerHint": "Ein Header pro Zeile. Ein Wert darf ein Geheimnis als {{secret.NAME}} nennen.",774
"wh.body": "Body-Vorlage",775
"wh.bodyHint": "Optional. Leer sendet das Ereignis als JSON.",776
"err.whTopic": "Thema ist ungültig",777
"err.whChat": "Chat-ID ist ungültig",778
"err.whRoom": "Raum ist ungültig",779
"err.whServer": "Server-URL fehlt",780
"err.whMethod": "Methode muss GET, POST, PUT oder PATCH sein",711
}781
}712
782
713
var fr = map[string]string{783
var fr = map[string]string{@@ -1063,4 +1133,39 @@ var fr = map[string]string{1063
"err.tagFail": "tag : %s",1133
"err.tagFail": "tag : %s",1064
"err.json": "json",1134
"err.json": "json",1065
"commit.pushedBy": "poussé par %s",1135
"commit.pushedBy": "poussé par %s",1136
1137
"set.preset.custom": "Aucun modèle",1138
"set.preset.slack": "Slack",1139
"set.preset.teams": "Microsoft Teams",1140
"set.preset.mattermost": "Mattermost",1141
"set.preset.rocketchat": "Rocket.Chat",1142
"set.preset.telegram": "Telegram",1143
"set.preset.matrix": "Matrix",1144
"set.preset.googlechat": "Google Chat",1145
"set.preset.ntfy": "ntfy",1146
"set.preset.gotify": "Gotify",1147
"wh.webhookURL": "URL du webhook",1148
"wh.url": "URL",1149
"wh.username": "Nom d’utilisateur",1150
"wh.avatar": "URL de l’avatar",1151
"wh.icon": "URL de l’icône",1152
"wh.alias": "Alias",1153
"wh.token": "Secret",1154
"wh.tokenHint": "Nom d’un secret, par exemple BOT_TOKEN.",1155
"wh.chat": "Identifiant du chat",1156
"wh.server": "Serveur",1157
"wh.topic": "Sujet",1158
"wh.homeserver": "Serveur d’accueil",1159
"wh.room": "Salon",1160
"wh.method": "Méthode",1161
"wh.contentType": "Type de contenu",1162
"wh.headers": "En-têtes",1163
"wh.headerHint": "Un en-tête par ligne. Une valeur peut citer un secret sous la forme {{secret.NAME}}.",1164
"wh.body": "Modèle du corps",1165
"wh.bodyHint": "Facultatif. Vide envoie l’événement en JSON.",1166
"err.whTopic": "sujet invalide",1167
"err.whChat": "identifiant de chat invalide",1168
"err.whRoom": "salon invalide",1169
"err.whServer": "l’URL du serveur manque",1170
"err.whMethod": "la méthode doit être GET, POST, PUT ou PATCH",1066
}1171
}@@ -187,7 +187,11 @@ func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev web
187
187
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())
188
188
continue
189
189
}
190
req, err := http.NewRequestWithContext(ctx, http.MethodPost, rawURL, bytes.NewReader(body))
190
method := h.Method
191
if method == "" {
192
method = http.MethodPost
193
}
194
req, err := http.NewRequestWithContext(ctx, method, rawURL, bytes.NewReader(body))
191
195
if err != nil {
192
196
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())
193
197
continue
@@ -187,7 +187,11 @@ func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev web187
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())187
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())188
continue188
continue189
}189
}190
req, err := http.NewRequestWithContext(ctx, http.MethodPost, rawURL, bytes.NewReader(body))190
method := h.Method191
if method == "" {192
method = http.MethodPost193
}194
req, err := http.NewRequestWithContext(ctx, method, rawURL, bytes.NewReader(body))191
if err != nil {195
if err != nil {192
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())196
_ = s.Store.AddDelivery(ctx, h.ID, ev.Type, 0, err.Error())193
continue197
continue@@ -186,6 +186,13 @@ func (s *Server) mustTemplates() {
186
186
},
187
187
"roleName": func(r access.Role) string { return i18n.T(l, "role."+string(r)) },
188
188
"visName": func(v string) string { return i18n.T(l, "vis."+v) },
189
"presetName": func(id string) string {
190
label := i18n.T(l, "set.preset."+id)
191
if label == "set.preset."+id {
192
return id
193
}
194
return label
195
},
189
196
}).ParseFS(webFS, "templates/*.html"))
190
197
}
191
198
s.tmpl = s.byLang[string(i18n.EN)]
@@ -531,6 +538,7 @@ type HookView struct {
531
538
Name string
532
539
Preset string
533
540
URL string
541
Method string
534
542
Filter string
535
543
Events string
536
544
Deliveries []store.Delivery
@@ -186,6 +186,13 @@ func (s *Server) mustTemplates() {186
},186
},187
"roleName": func(r access.Role) string { return i18n.T(l, "role."+string(r)) },187
"roleName": func(r access.Role) string { return i18n.T(l, "role."+string(r)) },188
"visName": func(v string) string { return i18n.T(l, "vis."+v) },188
"visName": func(v string) string { return i18n.T(l, "vis."+v) },189
"presetName": func(id string) string {190
label := i18n.T(l, "set.preset."+id)191
if label == "set.preset."+id {192
return id193
}194
return label195
},189
}).ParseFS(webFS, "templates/*.html"))196
}).ParseFS(webFS, "templates/*.html"))190
}197
}191
s.tmpl = s.byLang[string(i18n.EN)]198
s.tmpl = s.byLang[string(i18n.EN)]@@ -531,6 +538,7 @@ type HookView struct {531
Name string538
Name string532
Preset string539
Preset string533
URL string540
URL string541
Method string534
Filter string542
Filter string535
Events string543
Events string536
Deliveries []store.Delivery544
Deliveries []store.Delivery@@ -45,7 +45,7 @@ func (s *Server) hookViews(r *http.Request, kind string, id int64) []HookView {
45
45
for _, h := range hooks {
46
46
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)
47
47
out = append(out, HookView{
48
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate,
48
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate, Method: h.Method,
49
49
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "), Deliveries: d,
50
50
})
51
51
}
@@ -206,7 +206,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
206
206
}
207
207
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
208
208
preset := r.FormValue("preset")
209
if preset != webhook.PresetDiscord && preset != webhook.PresetGrok && preset != webhook.PresetGeneric {
209
if !webhook.KnownPreset(preset) {
210
210
s.redirect(w, r, back, "", s.tr(r, "err.preset"))
211
211
return
212
212
}
@@ -225,23 +225,22 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
225
225
s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))
226
226
return
227
227
}
228
headers := map[string]string{}
229
for _, line := range strings.Split(r.FormValue("headers"), "\n") {
230
line = strings.TrimSpace(line)
231
if line == "" {
232
continue
233
}
234
k, v, ok := strings.Cut(line, ":")
235
if !ok || strings.TrimSpace(k) == "" {
236
s.redirect(w, r, back, "", s.tr(r, "err.header"))
237
return
238
}
239
headers[strings.TrimSpace(k)] = strings.TrimSpace(v)
228
spec, err := webhook.Prepare(preset, webhook.Input{
229
URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),
230
Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),
231
Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),
232
Homeserver: r.FormValue("homeserver"), Room: r.FormValue("room"),
233
Method: r.FormValue("method"), ContentType: r.FormValue("content_type"),
234
Headers: r.FormValue("headers"), Body: r.FormValue("body"),
235
})
236
if err != nil {
237
s.redirect(w, r, back, "", s.trErr(r, err))
238
return
240
239
}
241
_, err := s.Store.CreateWebhook(r.Context(), store.Webhook{
240
_, err = s.Store.CreateWebhook(r.Context(), store.Webhook{
242
241
ScopeKind: kind, ScopeID: scopeID, Name: strings.TrimSpace(r.FormValue("name")),
243
Preset: preset, URLTemplate: strings.TrimSpace(r.FormValue("url")),
244
Headers: headers, BodyTemplate: r.FormValue("body"), Events: events, BranchFilter: filter,
242
Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,
243
BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,
245
244
})
246
245
if err != nil {
247
246
s.redirect(w, r, back, "", s.trErr(r, err))
@@ -45,7 +45,7 @@ func (s *Server) hookViews(r *http.Request, kind string, id int64) []HookView {45
for _, h := range hooks {45
for _, h := range hooks {46
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)46
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)47
out = append(out, HookView{47
out = append(out, HookView{48
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate,48
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate, Method: h.Method,49
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "), Deliveries: d,49
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "), Deliveries: d,50
})50
})51
}51
}@@ -206,7 +206,7 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string206
}206
}207
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")207
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")208
preset := r.FormValue("preset")208
preset := r.FormValue("preset")209
if preset != webhook.PresetDiscord && preset != webhook.PresetGrok && preset != webhook.PresetGeneric {209
if !webhook.KnownPreset(preset) {210
s.redirect(w, r, back, "", s.tr(r, "err.preset"))210
s.redirect(w, r, back, "", s.tr(r, "err.preset"))211
return211
return212
}212
}@@ -225,23 +225,22 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string225
s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))225
s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))226
return226
return227
}227
}228
headers := map[string]string{}228
spec, err := webhook.Prepare(preset, webhook.Input{229
for _, line := range strings.Split(r.FormValue("headers"), "\n") {229
URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),230
line = strings.TrimSpace(line)230
Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),231
if line == "" {231
Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),232
continue232
Homeserver: r.FormValue("homeserver"), Room: r.FormValue("room"),233
}233
Method: r.FormValue("method"), ContentType: r.FormValue("content_type"),234
k, v, ok := strings.Cut(line, ":")234
Headers: r.FormValue("headers"), Body: r.FormValue("body"),235
if !ok || strings.TrimSpace(k) == "" {235
})236
s.redirect(w, r, back, "", s.tr(r, "err.header"))236
if err != nil {237
return237
s.redirect(w, r, back, "", s.trErr(r, err))238
}238
return239
headers[strings.TrimSpace(k)] = strings.TrimSpace(v)240
}239
}241
_, err := s.Store.CreateWebhook(r.Context(), store.Webhook{240
_, err = s.Store.CreateWebhook(r.Context(), store.Webhook{242
ScopeKind: kind, ScopeID: scopeID, Name: strings.TrimSpace(r.FormValue("name")),241
ScopeKind: kind, ScopeID: scopeID, Name: strings.TrimSpace(r.FormValue("name")),243
Preset: preset, URLTemplate: strings.TrimSpace(r.FormValue("url")),242
Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,244
Headers: headers, BodyTemplate: r.FormValue("body"), Events: events, BranchFilter: filter,243
BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,245
})244
})246
if err != nil {245
if err != nil {247
s.redirect(w, r, back, "", s.trErr(r, err))246
s.redirect(w, r, back, "", s.trErr(r, err))@@ -55,6 +55,21 @@ code, pre { font-family: "IBM Plex Mono", "ui-monospace", monospace; }
55
55
pre, .code {
56
56
background: #0f1b2d; color: #e7eef8; padding: 0.8rem 1rem; border-radius: 12px; overflow: auto;
57
57
}
58
form.wh .wh-field { display: none; }
59
form.wh[data-preset="custom"] .for-custom,
60
form.wh[data-preset="generic"] .for-generic,
61
form.wh[data-preset="discord"] .for-discord,
62
form.wh[data-preset="slack"] .for-slack,
63
form.wh[data-preset="teams"] .for-teams,
64
form.wh[data-preset="mattermost"] .for-mattermost,
65
form.wh[data-preset="rocketchat"] .for-rocketchat,
66
form.wh[data-preset="telegram"] .for-telegram,
67
form.wh[data-preset="matrix"] .for-matrix,
68
form.wh[data-preset="googlechat"] .for-googlechat,
69
form.wh[data-preset="ntfy"] .for-ntfy,
70
form.wh[data-preset="gotify"] .for-gotify,
71
form.wh[data-preset="grok"] .for-grok { display: block; }
72
form.wh .wh-field .muted { display: block; margin-top: 0.25rem; }
58
73
ul.clean { list-style: none; padding: 0; }
59
74
ul.clean li { padding: 0.45rem 0; border-bottom: 1px solid var(--line); }
60
75
.pill { font-size: 0.78rem; border: 1px solid var(--line); border-radius: 999px; padding: 0.1rem 0.45rem; }
@@ -55,6 +55,21 @@ code, pre { font-family: "IBM Plex Mono", "ui-monospace", monospace; }55
pre, .code {55
pre, .code {56
background: #0f1b2d; color: #e7eef8; padding: 0.8rem 1rem; border-radius: 12px; overflow: auto;56
background: #0f1b2d; color: #e7eef8; padding: 0.8rem 1rem; border-radius: 12px; overflow: auto;57
}57
}58
form.wh .wh-field { display: none; }59
form.wh[data-preset="custom"] .for-custom,60
form.wh[data-preset="generic"] .for-generic,61
form.wh[data-preset="discord"] .for-discord,62
form.wh[data-preset="slack"] .for-slack,63
form.wh[data-preset="teams"] .for-teams,64
form.wh[data-preset="mattermost"] .for-mattermost,65
form.wh[data-preset="rocketchat"] .for-rocketchat,66
form.wh[data-preset="telegram"] .for-telegram,67
form.wh[data-preset="matrix"] .for-matrix,68
form.wh[data-preset="googlechat"] .for-googlechat,69
form.wh[data-preset="ntfy"] .for-ntfy,70
form.wh[data-preset="gotify"] .for-gotify,71
form.wh[data-preset="grok"] .for-grok { display: block; }72
form.wh .wh-field .muted { display: block; margin-top: 0.25rem; }58
ul.clean { list-style: none; padding: 0; }73
ul.clean { list-style: none; padding: 0; }59
ul.clean li { padding: 0.45rem 0; border-bottom: 1px solid var(--line); }74
ul.clean li { padding: 0.45rem 0; border-bottom: 1px solid var(--line); }60
.pill { font-size: 0.78rem; border: 1px solid var(--line); border-radius: 999px; padding: 0.1rem 0.45rem; }75
.pill { font-size: 0.78rem; border: 1px solid var(--line); border-radius: 999px; padding: 0.1rem 0.45rem; }@@ -0,0 +1,22 @@
1
(function () {
2
var form = document.querySelector("form.wh");
3
if (!form) {
4
return;
5
}
6
var select = form.querySelector("[data-preset-select]");
7
if (!select) {
8
return;
9
}
10
function apply() {
11
var preset = select.value || "custom";
12
form.setAttribute("data-preset", preset);
13
form.querySelectorAll(".wh-field").forEach(function (el) {
14
var on = el.classList.contains("for-" + preset);
15
el.querySelectorAll("input, textarea, select").forEach(function (input) {
16
input.disabled = !on;
17
});
18
});
19
}
20
select.addEventListener("change", apply);
21
apply();
22
})();
@@ -0,0 +1,22 @@1
(function () {2
var form = document.querySelector("form.wh");3
if (!form) {4
return;5
}6
var select = form.querySelector("[data-preset-select]");7
if (!select) {8
return;9
}10
function apply() {11
var preset = select.value || "custom";12
form.setAttribute("data-preset", preset);13
form.querySelectorAll(".wh-field").forEach(function (el) {14
var on = el.classList.contains("for-" + preset);15
el.querySelectorAll("input, textarea, select").forEach(function (input) {16
input.disabled = !on;17
});18
});19
}20
select.addEventListener("change", apply);21
apply();22
})();@@ -183,20 +183,53 @@
183
183
{{end}}
184
184
185
185
{{define "webhookform"}}
186
<form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}">
186
<form class="panel wh" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="custom">
187
187
<input type="hidden" name="csrf" value="{{.CSRF}}">
188
188
<label>{{t "set.whName"}} <input name="name" required></label>
189
189
<label>{{t "set.preset"}}
190
<select name="preset">
190
<select name="preset" data-preset-select>
191
<option value="custom" selected>{{t "set.preset.custom"}}</option>
191
192
<option value="generic">{{t "set.preset.generic"}}</option>
192
193
<option value="discord">{{t "set.preset.discord"}}</option>
194
<option value="slack">{{t "set.preset.slack"}}</option>
195
<option value="teams">{{t "set.preset.teams"}}</option>
196
<option value="mattermost">{{t "set.preset.mattermost"}}</option>
197
<option value="rocketchat">{{t "set.preset.rocketchat"}}</option>
198
<option value="telegram">{{t "set.preset.telegram"}}</option>
199
<option value="matrix">{{t "set.preset.matrix"}}</option>
200
<option value="googlechat">{{t "set.preset.googlechat"}}</option>
201
<option value="ntfy">{{t "set.preset.ntfy"}}</option>
202
<option value="gotify">{{t "set.preset.gotify"}}</option>
193
203
<option value="grok">{{t "set.preset.grok"}}</option>
194
204
</select>
195
205
</label>
196
<label>{{t "set.url"}} <input name="url" placeholder="https://example.test/hook" required></label>
206
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" placeholder="https://example.test/hook" required disabled></label>
207
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" placeholder="https://example.test/hook" required></label>
208
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled></label>
209
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" placeholder="https://example.test/avatar.png" disabled></label>
210
<label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>
211
<label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>
212
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>
213
<label class="wh-field for-telegram for-matrix for-gotify for-grok">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" required disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
214
<label class="wh-field for-ntfy">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
215
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>
216
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>
217
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>
218
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" required disabled></label>
219
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" placeholder="https://matrix.example" required disabled></label>
220
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" placeholder="!room:example.org" required disabled></label>
221
<label class="wh-field for-custom">{{t "wh.method"}}
222
<select name="method">
223
<option>POST</option>
224
<option>PUT</option>
225
<option>PATCH</option>
226
<option>GET</option>
227
</select>
228
</label>
229
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" placeholder="application/json"></label>
230
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}"></textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>
231
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body"></textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>
197
232
<label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>
198
<label>{{t "set.headers"}} <textarea name="headers" placeholder="Authorization: Bearer …"></textarea></label>
199
<label>{{t "set.body"}} <textarea name="body"></textarea></label>
200
233
<fieldset>
201
234
<label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>
202
235
<label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>
@@ -206,8 +239,9 @@
206
239
</fieldset>
207
240
<button type="submit">{{t "set.saveWebhook"}}</button>
208
241
</form>
242
<script src="/assets/webhook.js"></script>
209
243
<ul class="clean">
210
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{.Preset}} <span class="muted">{{.URL}}</span>
244
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{presetName .Preset}} <span class="muted">{{.Method}} {{.URL}}</span>
211
245
<div class="muted">{{.Events}} {{if .Filter}}· filter {{.Filter}}{{end}}</div>
212
246
{{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}
213
247
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
@@ -183,20 +183,53 @@183
{{end}}183
{{end}}184
184
185
{{define "webhookform"}}185
{{define "webhookform"}}186
<form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}">186
<form class="panel wh" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="custom">187
<input type="hidden" name="csrf" value="{{.CSRF}}">187
<input type="hidden" name="csrf" value="{{.CSRF}}">188
<label>{{t "set.whName"}} <input name="name" required></label>188
<label>{{t "set.whName"}} <input name="name" required></label>189
<label>{{t "set.preset"}}189
<label>{{t "set.preset"}}190
<select name="preset">190
<select name="preset" data-preset-select>191
<option value="custom" selected>{{t "set.preset.custom"}}</option>191
<option value="generic">{{t "set.preset.generic"}}</option>192
<option value="generic">{{t "set.preset.generic"}}</option>192
<option value="discord">{{t "set.preset.discord"}}</option>193
<option value="discord">{{t "set.preset.discord"}}</option>194
<option value="slack">{{t "set.preset.slack"}}</option>195
<option value="teams">{{t "set.preset.teams"}}</option>196
<option value="mattermost">{{t "set.preset.mattermost"}}</option>197
<option value="rocketchat">{{t "set.preset.rocketchat"}}</option>198
<option value="telegram">{{t "set.preset.telegram"}}</option>199
<option value="matrix">{{t "set.preset.matrix"}}</option>200
<option value="googlechat">{{t "set.preset.googlechat"}}</option>201
<option value="ntfy">{{t "set.preset.ntfy"}}</option>202
<option value="gotify">{{t "set.preset.gotify"}}</option>193
<option value="grok">{{t "set.preset.grok"}}</option>203
<option value="grok">{{t "set.preset.grok"}}</option>194
</select>204
</select>195
</label>205
</label>196
<label>{{t "set.url"}} <input name="url" placeholder="https://example.test/hook" required></label>206
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" placeholder="https://example.test/hook" required disabled></label>207
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" placeholder="https://example.test/hook" required></label>208
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled></label>209
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" placeholder="https://example.test/avatar.png" disabled></label>210
<label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>211
<label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>212
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>213
<label class="wh-field for-telegram for-matrix for-gotify for-grok">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" required disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>214
<label class="wh-field for-ntfy">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>215
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>216
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>217
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>218
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" required disabled></label>219
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" placeholder="https://matrix.example" required disabled></label>220
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" placeholder="!room:example.org" required disabled></label>221
<label class="wh-field for-custom">{{t "wh.method"}}222
<select name="method">223
<option>POST</option>224
<option>PUT</option>225
<option>PATCH</option>226
<option>GET</option>227
</select>228
</label>229
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" placeholder="application/json"></label>230
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}"></textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>231
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body"></textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>197
<label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>232
<label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>198
<label>{{t "set.headers"}} <textarea name="headers" placeholder="Authorization: Bearer …"></textarea></label>199
<label>{{t "set.body"}} <textarea name="body"></textarea></label>200
<fieldset>233
<fieldset>201
<label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>234
<label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>202
<label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>235
<label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>@@ -206,8 +239,9 @@206
</fieldset>239
</fieldset>207
<button type="submit">{{t "set.saveWebhook"}}</button>240
<button type="submit">{{t "set.saveWebhook"}}</button>208
</form>241
</form>242
<script src="/assets/webhook.js"></script>209
<ul class="clean">243
<ul class="clean">210
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{.Preset}} <span class="muted">{{.URL}}</span>244
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{presetName .Preset}} <span class="muted">{{.Method}} {{.URL}}</span>211
<div class="muted">{{.Events}} {{if .Filter}}· filter {{.Filter}}{{end}}</div>245
<div class="muted">{{.Events}} {{if .Filter}}· filter {{.Filter}}{{end}}</div>212
{{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}246
{{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}213
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">247
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">@@ -0,0 +1,159 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"os/exec"
10
"path/filepath"
11
"strings"
12
"testing"
13
14
"gitlab.com/Timfa/bluegit/internal/auth"
15
"gitlab.com/Timfa/bluegit/internal/config"
16
"gitlab.com/Timfa/bluegit/internal/store"
17
"gitlab.com/Timfa/bluegit/internal/webhook"
18
)
19
20
func TestWebhookPresetForm(t *testing.T) {
21
if _, err := exec.LookPath("git"); err != nil {
22
t.Skip("git ontbreekt")
23
}
24
storage := t.TempDir()
25
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26
if err != nil {
27
t.Fatal(err)
28
}
29
t.Cleanup(func() { _ = st.Close() })
30
cfg := config.Config{
31
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
33
Git: config.Git{Binary: "git", DefaultBranch: "master"},
34
}
35
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36
ts := httptest.NewServer(srv.Handler())
37
t.Cleanup(ts.Close)
38
39
jar, _ := cookiejar.New(nil)
40
client := &http.Client{Jar: jar}
41
res, err := client.Get(ts.URL + "/login")
42
if err != nil {
43
t.Fatal(err)
44
}
45
page := read(t, res)
46
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
47
"csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},
48
})
49
if err != nil {
50
t.Fatal(err)
51
}
52
_ = read(t, res)
53
54
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")
55
if err != nil {
56
t.Fatal(err)
57
}
58
form := read(t, res)
59
for _, needle := range []string{
60
"No preset", "Generic JSON", "Discord", "Slack", "Microsoft Teams", "Mattermost",
61
"Rocket.Chat", "Telegram", "Matrix", "Google Chat", "ntfy", "Gotify", "Grok Bot",
62
`data-preset="custom"`, `/assets/webhook.js`, `name="headers"`, `name="content_type"`,
63
`name="username" disabled`, `placeholder="Authorization: Bearer {{secret.NAME}}"`,
64
} {
65
if !strings.Contains(form, needle) {
66
t.Fatalf("formulier mist %q", needle)
67
}
68
}
69
if strings.Contains(form, "Discord webhook") {
70
t.Fatal("generieke velden noemen een dienst")
71
}
72
js, err := client.Get(ts.URL + "/assets/webhook.js")
73
if err != nil {
74
t.Fatal(err)
75
}
76
script := read(t, js)
77
if js.StatusCode != 200 || !strings.Contains(script, "data-preset") {
78
t.Fatalf("webhook.js %d", js.StatusCode)
79
}
80
81
ctx := context.Background()
82
repo, err := st.RepoByPath(ctx, "tim", "hooks")
83
if err != nil {
84
t.Fatal(err)
85
}
86
post := func(values url.Values) {
87
t.Helper()
88
values.Set("csrf", csrfOf(t, form))
89
res, err := client.PostForm(ts.URL+"/tim/hooks/-/webhooks", values)
90
if err != nil {
91
t.Fatal(err)
92
}
93
form = read(t, res)
94
}
95
post(url.Values{
96
"name": {"discord"}, "preset": {"discord"}, "url": {"https://discord.example/hook"},
97
"username": {"BlueGit"}, "event_push": {"1"},
98
})
99
post(url.Values{
100
"name": {"telegram"}, "preset": {"telegram"}, "token": {"BOT_TOKEN"}, "chat": {"100"},
101
"event_merge_request": {"1"},
102
})
103
post(url.Values{
104
"name": {"ntfy"}, "preset": {"ntfy"}, "topic": {"builds"}, "token": {"NTFY"},
105
"event_pipeline_success": {"1"},
106
})
107
post(url.Values{
108
"name": {"plain"}, "preset": {"custom"}, "url": {"https://example.test/hook"},
109
"method": {"PUT"}, "content_type": {"text/plain"},
110
"headers": {"X-Token: {{secret.BOT_TOKEN}}"}, "body": {"{{event.summary}}"},
111
"event_release_published": {"1"},
112
})
113
if !strings.Contains(form, "Discord") || !strings.Contains(form, "PUT https://example.test/hook") {
114
t.Fatalf("opgeslagen hooks:\n%s", form)
115
}
116
if strings.Contains(form, "BOT_TOKEN") && strings.Contains(form, "secret-value") {
117
t.Fatal("geheime waarde op de pagina")
118
}
119
120
hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)
121
if err != nil {
122
t.Fatal(err)
123
}
124
byName := map[string]store.Webhook{}
125
for _, h := range hooks {
126
byName[h.Name] = h
127
}
128
if h := byName["discord"]; h.Preset != webhook.PresetDiscord || h.Method != "POST" || !strings.Contains(h.BodyTemplate, `"username":"BlueGit"`) || !strings.Contains(h.BodyTemplate, "{{event.summary_json}}") {
129
t.Fatalf("discord %#v", h)
130
}
131
if h := byName["telegram"]; !strings.Contains(h.URLTemplate, "https://api.telegram.org/bot{{secret.BOT_TOKEN}}/sendMessage") || !strings.Contains(h.BodyTemplate, `"chat_id":"100"`) {
132
t.Fatalf("telegram %#v", h)
133
}
134
if h := byName["ntfy"]; h.URLTemplate != "https://ntfy.sh/builds" || h.Headers["Content-Type"] != "text/plain" || h.Headers["Authorization"] != "Bearer {{secret.NTFY}}" || h.BodyTemplate != "{{event.summary}}" {
135
t.Fatalf("ntfy %#v", h)
136
}
137
if h := byName["plain"]; h.Preset != webhook.PresetCustom || h.Method != "PUT" || h.Headers["Content-Type"] != "text/plain" || h.Headers["X-Token"] != "{{secret.BOT_TOKEN}}" || h.BodyTemplate != "{{event.summary}}" {
138
t.Fatalf("custom %#v", h)
139
}
140
141
post(url.Values{"name": {"nope"}, "preset": {"carrier"}, "url": {"https://example.test/hook"}, "event_push": {"1"}})
142
if !strings.Contains(form, "unknown preset") {
143
t.Fatalf("onbekende preset:\n%s", form)
144
}
145
146
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, form)}, "language": {"nl"}})
147
if err != nil {
148
t.Fatal(err)
149
}
150
_ = read(t, res)
151
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")
152
if err != nil {
153
t.Fatal(err)
154
}
155
nl := read(t, res)
156
if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Naam van een geheim") {
157
t.Fatalf("nederlandse preset:\n%s", nl)
158
}
159
}
@@ -0,0 +1,159 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"os/exec"10
"path/filepath"11
"strings"12
"testing"13
14
"gitlab.com/Timfa/bluegit/internal/auth"15
"gitlab.com/Timfa/bluegit/internal/config"16
"gitlab.com/Timfa/bluegit/internal/store"17
"gitlab.com/Timfa/bluegit/internal/webhook"18
)19
20
func TestWebhookPresetForm(t *testing.T) {21
if _, err := exec.LookPath("git"); err != nil {22
t.Skip("git ontbreekt")23
}24
storage := t.TempDir()25
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())26
if err != nil {27
t.Fatal(err)28
}29
t.Cleanup(func() { _ = st.Close() })30
cfg := config.Config{31
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,32
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},33
Git: config.Git{Binary: "git", DefaultBranch: "master"},34
}35
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}36
ts := httptest.NewServer(srv.Handler())37
t.Cleanup(ts.Close)38
39
jar, _ := cookiejar.New(nil)40
client := &http.Client{Jar: jar}41
res, err := client.Get(ts.URL + "/login")42
if err != nil {43
t.Fatal(err)44
}45
page := read(t, res)46
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{47
"csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},48
})49
if err != nil {50
t.Fatal(err)51
}52
_ = read(t, res)53
54
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")55
if err != nil {56
t.Fatal(err)57
}58
form := read(t, res)59
for _, needle := range []string{60
"No preset", "Generic JSON", "Discord", "Slack", "Microsoft Teams", "Mattermost",61
"Rocket.Chat", "Telegram", "Matrix", "Google Chat", "ntfy", "Gotify", "Grok Bot",62
`data-preset="custom"`, `/assets/webhook.js`, `name="headers"`, `name="content_type"`,63
`name="username" disabled`, `placeholder="Authorization: Bearer {{secret.NAME}}"`,64
} {65
if !strings.Contains(form, needle) {66
t.Fatalf("formulier mist %q", needle)67
}68
}69
if strings.Contains(form, "Discord webhook") {70
t.Fatal("generieke velden noemen een dienst")71
}72
js, err := client.Get(ts.URL + "/assets/webhook.js")73
if err != nil {74
t.Fatal(err)75
}76
script := read(t, js)77
if js.StatusCode != 200 || !strings.Contains(script, "data-preset") {78
t.Fatalf("webhook.js %d", js.StatusCode)79
}80
81
ctx := context.Background()82
repo, err := st.RepoByPath(ctx, "tim", "hooks")83
if err != nil {84
t.Fatal(err)85
}86
post := func(values url.Values) {87
t.Helper()88
values.Set("csrf", csrfOf(t, form))89
res, err := client.PostForm(ts.URL+"/tim/hooks/-/webhooks", values)90
if err != nil {91
t.Fatal(err)92
}93
form = read(t, res)94
}95
post(url.Values{96
"name": {"discord"}, "preset": {"discord"}, "url": {"https://discord.example/hook"},97
"username": {"BlueGit"}, "event_push": {"1"},98
})99
post(url.Values{100
"name": {"telegram"}, "preset": {"telegram"}, "token": {"BOT_TOKEN"}, "chat": {"100"},101
"event_merge_request": {"1"},102
})103
post(url.Values{104
"name": {"ntfy"}, "preset": {"ntfy"}, "topic": {"builds"}, "token": {"NTFY"},105
"event_pipeline_success": {"1"},106
})107
post(url.Values{108
"name": {"plain"}, "preset": {"custom"}, "url": {"https://example.test/hook"},109
"method": {"PUT"}, "content_type": {"text/plain"},110
"headers": {"X-Token: {{secret.BOT_TOKEN}}"}, "body": {"{{event.summary}}"},111
"event_release_published": {"1"},112
})113
if !strings.Contains(form, "Discord") || !strings.Contains(form, "PUT https://example.test/hook") {114
t.Fatalf("opgeslagen hooks:\n%s", form)115
}116
if strings.Contains(form, "BOT_TOKEN") && strings.Contains(form, "secret-value") {117
t.Fatal("geheime waarde op de pagina")118
}119
120
hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)121
if err != nil {122
t.Fatal(err)123
}124
byName := map[string]store.Webhook{}125
for _, h := range hooks {126
byName[h.Name] = h127
}128
if h := byName["discord"]; h.Preset != webhook.PresetDiscord || h.Method != "POST" || !strings.Contains(h.BodyTemplate, `"username":"BlueGit"`) || !strings.Contains(h.BodyTemplate, "{{event.summary_json}}") {129
t.Fatalf("discord %#v", h)130
}131
if h := byName["telegram"]; !strings.Contains(h.URLTemplate, "https://api.telegram.org/bot{{secret.BOT_TOKEN}}/sendMessage") || !strings.Contains(h.BodyTemplate, `"chat_id":"100"`) {132
t.Fatalf("telegram %#v", h)133
}134
if h := byName["ntfy"]; h.URLTemplate != "https://ntfy.sh/builds" || h.Headers["Content-Type"] != "text/plain" || h.Headers["Authorization"] != "Bearer {{secret.NTFY}}" || h.BodyTemplate != "{{event.summary}}" {135
t.Fatalf("ntfy %#v", h)136
}137
if h := byName["plain"]; h.Preset != webhook.PresetCustom || h.Method != "PUT" || h.Headers["Content-Type"] != "text/plain" || h.Headers["X-Token"] != "{{secret.BOT_TOKEN}}" || h.BodyTemplate != "{{event.summary}}" {138
t.Fatalf("custom %#v", h)139
}140
141
post(url.Values{"name": {"nope"}, "preset": {"carrier"}, "url": {"https://example.test/hook"}, "event_push": {"1"}})142
if !strings.Contains(form, "unknown preset") {143
t.Fatalf("onbekende preset:\n%s", form)144
}145
146
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, form)}, "language": {"nl"}})147
if err != nil {148
t.Fatal(err)149
}150
_ = read(t, res)151
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")152
if err != nil {153
t.Fatal(err)154
}155
nl := read(t, res)156
if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Naam van een geheim") {157
t.Fatalf("nederlandse preset:\n%s", nl)158
}159
}@@ -24,6 +24,7 @@ type Webhook struct {
24
24
Events []string
25
25
BranchFilter string
26
26
Active bool
27
Method string
27
28
}
28
29
29
30
// CreateWebhook bewaart een webhook.
@@ -34,9 +35,12 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {
34
35
if w.Preset == "" {
35
36
w.Preset = "generic"
36
37
}
37
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, created_at)
38
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)`,
39
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, now())
38
if w.Method == "" {
39
w.Method = "POST"
40
}
41
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, created_at)
42
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`,
43
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, now())
40
44
if err != nil {
41
45
return 0, err
42
46
}
@@ -45,7 +49,7 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {
45
49
46
50
// ListWebhooks geeft de webhooks van een repository of groep.
47
51
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {
48
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)
52
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)
49
53
if err != nil {
50
54
return nil, err
51
55
}
@@ -65,7 +69,7 @@ func scanWebhook(rows *sql.Rows) (Webhook, error) {
65
69
var w Webhook
66
70
var headers, events string
67
71
var active int
68
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active); err != nil {
72
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method); err != nil {
69
73
return Webhook{}, err
70
74
}
71
75
w.Active = active == 1
@@ -24,6 +24,7 @@ type Webhook struct {24
Events []string24
Events []string25
BranchFilter string25
BranchFilter string26
Active bool26
Active bool27
Method string27
}28
}28
29
29
// CreateWebhook bewaart een webhook.30
// CreateWebhook bewaart een webhook.@@ -34,9 +35,12 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {34
if w.Preset == "" {35
if w.Preset == "" {35
w.Preset = "generic"36
w.Preset = "generic"36
}37
}37
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, created_at)38
if w.Method == "" {38
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)`,39
w.Method = "POST"39
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, now())40
}41
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, created_at)42
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`,43
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, now())40
if err != nil {44
if err != nil {41
return 0, err45
return 0, err42
}46
}@@ -45,7 +49,7 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {45
49
46
// ListWebhooks geeft de webhooks van een repository of groep.50
// ListWebhooks geeft de webhooks van een repository of groep.47
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {51
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {48
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)52
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)49
if err != nil {53
if err != nil {50
return nil, err54
return nil, err51
}55
}@@ -65,7 +69,7 @@ func scanWebhook(rows *sql.Rows) (Webhook, error) {65
var w Webhook69
var w Webhook66
var headers, events string70
var headers, events string67
var active int71
var active int68
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active); err != nil {72
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method); err != nil {69
return Webhook{}, err73
return Webhook{}, err70
}74
}71
w.Active = active == 175
w.Active = active == 1@@ -62,6 +62,7 @@ func (s *Store) migrate() error {
62
62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,
63
63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64
64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
65
66
}
66
67
for _, q := range alters {
67
68
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -181,6 +182,7 @@ CREATE TABLE IF NOT EXISTS webhooks (
181
182
events_json TEXT NOT NULL,
182
183
branch_filter TEXT NOT NULL DEFAULT '',
183
184
active INTEGER NOT NULL DEFAULT 1,
185
method TEXT NOT NULL DEFAULT 'POST',
184
186
created_at TEXT NOT NULL
185
187
);
186
188
CREATE TABLE IF NOT EXISTS webhook_deliveries (
@@ -62,6 +62,7 @@ func (s *Store) migrate() error {62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,65
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,65
}66
}66
for _, q := range alters {67
for _, q := range alters {67
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {68
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {@@ -181,6 +182,7 @@ CREATE TABLE IF NOT EXISTS webhooks (181
events_json TEXT NOT NULL,182
events_json TEXT NOT NULL,182
branch_filter TEXT NOT NULL DEFAULT '',183
branch_filter TEXT NOT NULL DEFAULT '',183
active INTEGER NOT NULL DEFAULT 1,184
active INTEGER NOT NULL DEFAULT 1,185
method TEXT NOT NULL DEFAULT 'POST',184
created_at TEXT NOT NULL186
created_at TEXT NOT NULL185
);187
);186
CREATE TABLE IF NOT EXISTS webhook_deliveries (188
CREATE TABLE IF NOT EXISTS webhook_deliveries (@@ -0,0 +1,346 @@
1
package webhook
2
3
import (
4
"encoding/json"
5
"strings"
6
"testing"
7
)
8
9
func TestPresetPayloads(t *testing.T) {
10
ev := Event{
11
Type: EventPush,
12
Project: `tim/blue "git"`,
13
Summary: "say \"hi\"\nnext",
14
Commit: "abc",
15
Branch: "master",
16
URL: "https://git.example/tim/blue",
17
Actor: "tim",
18
}
19
secrets := map[string]string{
20
"BOT_TOKEN": "secret-value",
21
"GROK_TOKEN": "grok-secret",
22
"NTFY": "ntfy-secret",
23
}
24
wantText := func(body []byte, key string) {
25
t.Helper()
26
var payload map[string]any
27
if err := json.Unmarshal(body, &payload); err != nil {
28
t.Fatalf("%s geen json: %s (%v)", key, body, err)
29
}
30
if payload[key] != ev.Summary {
31
t.Fatalf("%s = %#v, body %s", key, payload[key], body)
32
}
33
}
34
35
spec, err := Prepare(PresetDiscord, Input{URL: "https://discord.example/hook"})
36
if err != nil {
37
t.Fatal(err)
38
}
39
body, err := RenderBody(spec.Body, ev, secrets)
40
if err != nil {
41
t.Fatal(err)
42
}
43
wantText(body, "content")
44
if strings.Contains(spec.Body, "username") || strings.Contains(spec.Body, "avatar_url") {
45
t.Fatalf("lege discord-opties horen weg: %s", spec.Body)
46
}
47
spec, err = Prepare(PresetDiscord, Input{
48
URL: "https://discord.example/hook", Username: `bot "a"`, Avatar: "https://example.test/a.png",
49
})
50
if err != nil {
51
t.Fatal(err)
52
}
53
body, err = RenderBody(spec.Body, ev, secrets)
54
if err != nil {
55
t.Fatal(err)
56
}
57
var discord map[string]any
58
if err := json.Unmarshal(body, &discord); err != nil {
59
t.Fatal(err)
60
}
61
if discord["content"] != ev.Summary || discord["username"] != `bot "a"` || discord["avatar_url"] != "https://example.test/a.png" {
62
t.Fatalf("discord %#v", discord)
63
}
64
headers, err := RenderHeaders(PresetDiscord, spec.Headers, ev, secrets)
65
if err != nil || headers["Content-Type"] != "application/json" || spec.Method != "POST" {
66
t.Fatalf("discord headers %v %s %v", headers, spec.Method, err)
67
}
68
69
for _, preset := range []string{PresetSlack, PresetGoogleChat} {
70
spec, err = Prepare(preset, Input{URL: "https://chat.example/hook"})
71
if err != nil {
72
t.Fatal(preset, err)
73
}
74
body, err = RenderBody(spec.Body, ev, secrets)
75
if err != nil {
76
t.Fatal(preset, err)
77
}
78
wantText(body, "text")
79
if spec.Method != "POST" {
80
t.Fatal(preset, spec.Method)
81
}
82
}
83
84
spec, err = Prepare(PresetTeams, Input{URL: "https://outlook.example/webhook"})
85
if err != nil {
86
t.Fatal(err)
87
}
88
body, err = RenderBody(spec.Body, ev, secrets)
89
if err != nil {
90
t.Fatal(err)
91
}
92
var teams map[string]any
93
if err := json.Unmarshal(body, &teams); err != nil {
94
t.Fatal(err)
95
}
96
if teams["@type"] != "MessageCard" || teams["text"] != ev.Summary || teams["summary"] != ev.Summary {
97
t.Fatalf("teams %#v", teams)
98
}
99
100
spec, err = Prepare(PresetMattermost, Input{URL: "https://chat.example/hooks/a", Username: "blue", Icon: "https://example.test/icon.png"})
101
if err != nil {
102
t.Fatal(err)
103
}
104
body, err = RenderBody(spec.Body, ev, secrets)
105
if err != nil {
106
t.Fatal(err)
107
}
108
var mm map[string]any
109
if err := json.Unmarshal(body, &mm); err != nil {
110
t.Fatal(err)
111
}
112
if mm["text"] != ev.Summary || mm["username"] != "blue" || mm["icon_url"] != "https://example.test/icon.png" {
113
t.Fatalf("mattermost %#v", mm)
114
}
115
116
spec, err = Prepare(PresetRocketChat, Input{URL: "https://chat.example/hooks/b"})
117
if err != nil {
118
t.Fatal(err)
119
}
120
if strings.Contains(spec.Body, "alias") {
121
t.Fatal(spec.Body)
122
}
123
spec, err = Prepare(PresetRocketChat, Input{URL: "https://chat.example/hooks/b", Alias: `rocket "bot"`})
124
if err != nil {
125
t.Fatal(err)
126
}
127
body, err = RenderBody(spec.Body, ev, secrets)
128
if err != nil {
129
t.Fatal(err)
130
}
131
var rocket map[string]any
132
if err := json.Unmarshal(body, &rocket); err != nil {
133
t.Fatal(err)
134
}
135
if rocket["text"] != ev.Summary || rocket["alias"] != `rocket "bot"` {
136
t.Fatalf("rocket %#v", rocket)
137
}
138
139
spec, err = Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: "42"})
140
if err != nil {
141
t.Fatal(err)
142
}
143
if !strings.Contains(spec.URL, "{{secret.BOT_TOKEN}}") {
144
t.Fatal(spec.URL)
145
}
146
url, err := Expand(spec.URL, ev, secrets)
147
if err != nil || url != "https://api.telegram.org/botsecret-value/sendMessage" {
148
t.Fatalf("telegram url %s %v", url, err)
149
}
150
body, err = RenderBody(spec.Body, ev, secrets)
151
if err != nil {
152
t.Fatal(err)
153
}
154
var tg map[string]any
155
if err := json.Unmarshal(body, &tg); err != nil {
156
t.Fatal(string(body), err)
157
}
158
if tg["chat_id"] != "42" || tg["text"] != ev.Summary {
159
t.Fatalf("telegram %#v", tg)
160
}
161
162
spec, err = Prepare(PresetMatrix, Input{
163
Homeserver: "https://matrix.example/", Token: "BOT_TOKEN", Room: "!abc:example.org",
164
})
165
if err != nil {
166
t.Fatal(err)
167
}
168
if spec.Method != "PUT" || !strings.Contains(spec.URL, "/rooms/%21abc%3Aexample.org/send/m.room.message/bluegit-") {
169
t.Fatalf("matrix %s %s", spec.Method, spec.URL)
170
}
171
if spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {
172
t.Fatal(spec.Headers)
173
}
174
headers, err = RenderHeaders(PresetMatrix, spec.Headers, ev, secrets)
175
if err != nil || headers["Authorization"] != "Bearer secret-value" {
176
t.Fatalf("matrix auth %v %v", headers, err)
177
}
178
expanded, err := Expand(spec.URL, ev, secrets)
179
if err != nil || !strings.Contains(expanded, "/bluegit-push-abc--") {
180
t.Fatalf("matrix txn %s %v", expanded, err)
181
}
182
body, err = RenderBody(spec.Body, ev, secrets)
183
if err != nil {
184
t.Fatal(err)
185
}
186
var mx map[string]any
187
if err := json.Unmarshal(body, &mx); err != nil {
188
t.Fatal(err)
189
}
190
if mx["msgtype"] != "m.text" || mx["body"] != ev.Summary {
191
t.Fatalf("matrix %#v", mx)
192
}
193
194
spec, err = Prepare(PresetNtfy, Input{Topic: "builds"})
195
if err != nil {
196
t.Fatal(err)
197
}
198
if spec.URL != "https://ntfy.sh/builds" || spec.Headers["Content-Type"] != "text/plain" || spec.Headers["Authorization"] != "" {
199
t.Fatalf("ntfy default %#v %s", spec.Headers, spec.URL)
200
}
201
body, err = RenderBody(spec.Body, ev, secrets)
202
if err != nil || string(body) != ev.Summary {
203
t.Fatalf("ntfy body %q %v", body, err)
204
}
205
headers, err = RenderHeaders(PresetNtfy, spec.Headers, ev, secrets)
206
if err != nil || headers["Content-Type"] != "text/plain" {
207
t.Fatalf("ntfy content-type verliest van de json-preset: %v %v", headers, err)
208
}
209
spec, err = Prepare(PresetNtfy, Input{Server: "https://ntfy.example", Topic: "/alerts/", Token: "NTFY"})
210
if err != nil {
211
t.Fatal(err)
212
}
213
if spec.URL != "https://ntfy.example/alerts" || spec.Headers["Authorization"] != "Bearer {{secret.NTFY}}" {
214
t.Fatalf("ntfy %#v %s", spec.Headers, spec.URL)
215
}
216
217
spec, err = Prepare(PresetGotify, Input{Server: "https://gotify.example/", Token: "BOT_TOKEN"})
218
if err != nil {
219
t.Fatal(err)
220
}
221
if spec.URL != "https://gotify.example/message" || spec.Headers["X-Gotify-Key"] != "{{secret.BOT_TOKEN}}" {
222
t.Fatalf("gotify %#v %s", spec.Headers, spec.URL)
223
}
224
headers, err = RenderHeaders(PresetGotify, spec.Headers, ev, secrets)
225
if err != nil || headers["X-Gotify-Key"] != "secret-value" {
226
t.Fatalf("gotify key %v %v", headers, err)
227
}
228
body, err = RenderBody(spec.Body, ev, secrets)
229
if err != nil {
230
t.Fatal(err)
231
}
232
var gotify map[string]any
233
if err := json.Unmarshal(body, &gotify); err != nil {
234
t.Fatal(err)
235
}
236
if gotify["title"] != ev.Project || gotify["message"] != ev.Summary {
237
t.Fatalf("gotify %#v", gotify)
238
}
239
240
spec, err = Prepare(PresetGrok, Input{URL: "https://api.example/grok", Token: "BOT_TOKEN"})
241
if err != nil {
242
t.Fatal(err)
243
}
244
if spec.Body != "" || spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {
245
t.Fatalf("grok %#v %q", spec.Headers, spec.Body)
246
}
247
headers, err = RenderHeaders(PresetGrok, spec.Headers, ev, secrets)
248
if err != nil || headers["Authorization"] != "Bearer secret-value" {
249
t.Fatalf("gekozen grok-geheim %v %v", headers, err)
250
}
251
body, err = RenderBody(spec.Body, ev, secrets)
252
if err != nil {
253
t.Fatal(err)
254
}
255
var grok map[string]string
256
if err := json.Unmarshal(body, &grok); err != nil || grok["project"] != ev.Project || strings.Contains(string(body), "secret-value") {
257
t.Fatalf("grok body %s %v", body, err)
258
}
259
legacy, err := RenderHeaders(PresetGrok, nil, ev, secrets)
260
if err != nil || legacy["Authorization"] != "Bearer grok-secret" {
261
t.Fatalf("oude grok-hook houdt GROK_TOKEN: %v %v", legacy, err)
262
}
263
264
spec, err = Prepare(PresetGeneric, Input{URL: "https://example.test/hook"})
265
if err != nil {
266
t.Fatal(err)
267
}
268
if spec.Body != "" || spec.Method != "POST" || spec.Headers["Content-Type"] != "application/json" {
269
t.Fatalf("generic %#v", spec)
270
}
271
body, err = RenderBody(spec.Body, ev, secrets)
272
if err != nil {
273
t.Fatal(err)
274
}
275
var generic map[string]string
276
if err := json.Unmarshal(body, &generic); err != nil || generic["summary"] != ev.Summary || generic["type"] != EventPush {
277
t.Fatalf("generic %s %v", body, err)
278
}
279
oldDiscord, err := RenderBody("", ev, secrets)
280
if err != nil {
281
t.Fatal(err)
282
}
283
if string(oldDiscord) != string(body) {
284
t.Fatalf("lege body blijft de gebeurtenis: %s", oldDiscord)
285
}
286
287
spec, err = Prepare(PresetCustom, Input{
288
URL: "https://example.test/hook", Method: "put", ContentType: "text/plain",
289
Headers: "Authorization: Bearer {{secret.BOT_TOKEN}}\n",
290
Body: "hello {{event.summary}}",
291
})
292
if err != nil {
293
t.Fatal(err)
294
}
295
if spec.Method != "PUT" || spec.Headers["Content-Type"] != "text/plain" || spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {
296
t.Fatalf("custom %#v %s", spec.Headers, spec.Method)
297
}
298
headers, err = RenderHeaders(PresetCustom, spec.Headers, ev, secrets)
299
if err != nil || headers["Authorization"] != "Bearer secret-value" || headers["Content-Type"] != "text/plain" {
300
t.Fatalf("custom headers %v %v", headers, err)
301
}
302
body, err = RenderBody(spec.Body, ev, secrets)
303
if err != nil || string(body) != "hello "+ev.Summary {
304
t.Fatalf("custom body %q %v", body, err)
305
}
306
empty, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook"})
307
if err != nil || empty.Method != "POST" || empty.Body != "" || empty.Headers["Content-Type"] != "application/json" {
308
t.Fatalf("custom leeg %#v %v", empty, err)
309
}
310
}
311
312
func TestPresetRejects(t *testing.T) {
313
if _, err := Prepare("nope", Input{}); err == nil {
314
t.Fatal("onbekende preset")
315
}
316
if _, err := Prepare(PresetTelegram, Input{Token: "lower", Chat: "1"}); err == nil {
317
t.Fatal("geheime naam")
318
}
319
if _, err := Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: ""}); err == nil {
320
t.Fatal("lege chat")
321
}
322
if _, err := Prepare(PresetNtfy, Input{Topic: ""}); err == nil {
323
t.Fatal("leeg topic")
324
}
325
if _, err := Prepare(PresetNtfy, Input{Topic: "a b"}); err == nil {
326
t.Fatal("topic met spatie")
327
}
328
if _, err := Prepare(PresetMatrix, Input{Homeserver: "https://matrix.example", Token: "BOT_TOKEN", Room: "room id"}); err == nil {
329
t.Fatal("kamer met spatie")
330
}
331
if _, err := Prepare(PresetGotify, Input{Token: "BOT_TOKEN"}); err == nil {
332
t.Fatal("gotify zonder server")
333
}
334
if _, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook", Method: "DELETE"}); err == nil {
335
t.Fatal("methode")
336
}
337
if _, err := Prepare(PresetCustom, Input{URL: "https://user:pass@example.test/hook"}); err == nil {
338
t.Fatal("userinfo")
339
}
340
if _, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook", Headers: "Authorization Bearer x"}); err == nil {
341
t.Fatal("header zonder dubbele punt")
342
}
343
if !KnownPreset(PresetCustom) || !KnownPreset(PresetGeneric) || KnownPreset("") {
344
t.Fatal("KnownPreset")
345
}
346
}
@@ -0,0 +1,346 @@1
package webhook2
3
import (4
"encoding/json"5
"strings"6
"testing"7
)8
9
func TestPresetPayloads(t *testing.T) {10
ev := Event{11
Type: EventPush,12
Project: `tim/blue "git"`,13
Summary: "say \"hi\"\nnext",14
Commit: "abc",15
Branch: "master",16
URL: "https://git.example/tim/blue",17
Actor: "tim",18
}19
secrets := map[string]string{20
"BOT_TOKEN": "secret-value",21
"GROK_TOKEN": "grok-secret",22
"NTFY": "ntfy-secret",23
}24
wantText := func(body []byte, key string) {25
t.Helper()26
var payload map[string]any27
if err := json.Unmarshal(body, &payload); err != nil {28
t.Fatalf("%s geen json: %s (%v)", key, body, err)29
}30
if payload[key] != ev.Summary {31
t.Fatalf("%s = %#v, body %s", key, payload[key], body)32
}33
}34
35
spec, err := Prepare(PresetDiscord, Input{URL: "https://discord.example/hook"})36
if err != nil {37
t.Fatal(err)38
}39
body, err := RenderBody(spec.Body, ev, secrets)40
if err != nil {41
t.Fatal(err)42
}43
wantText(body, "content")44
if strings.Contains(spec.Body, "username") || strings.Contains(spec.Body, "avatar_url") {45
t.Fatalf("lege discord-opties horen weg: %s", spec.Body)46
}47
spec, err = Prepare(PresetDiscord, Input{48
URL: "https://discord.example/hook", Username: `bot "a"`, Avatar: "https://example.test/a.png",49
})50
if err != nil {51
t.Fatal(err)52
}53
body, err = RenderBody(spec.Body, ev, secrets)54
if err != nil {55
t.Fatal(err)56
}57
var discord map[string]any58
if err := json.Unmarshal(body, &discord); err != nil {59
t.Fatal(err)60
}61
if discord["content"] != ev.Summary || discord["username"] != `bot "a"` || discord["avatar_url"] != "https://example.test/a.png" {62
t.Fatalf("discord %#v", discord)63
}64
headers, err := RenderHeaders(PresetDiscord, spec.Headers, ev, secrets)65
if err != nil || headers["Content-Type"] != "application/json" || spec.Method != "POST" {66
t.Fatalf("discord headers %v %s %v", headers, spec.Method, err)67
}68
69
for _, preset := range []string{PresetSlack, PresetGoogleChat} {70
spec, err = Prepare(preset, Input{URL: "https://chat.example/hook"})71
if err != nil {72
t.Fatal(preset, err)73
}74
body, err = RenderBody(spec.Body, ev, secrets)75
if err != nil {76
t.Fatal(preset, err)77
}78
wantText(body, "text")79
if spec.Method != "POST" {80
t.Fatal(preset, spec.Method)81
}82
}83
84
spec, err = Prepare(PresetTeams, Input{URL: "https://outlook.example/webhook"})85
if err != nil {86
t.Fatal(err)87
}88
body, err = RenderBody(spec.Body, ev, secrets)89
if err != nil {90
t.Fatal(err)91
}92
var teams map[string]any93
if err := json.Unmarshal(body, &teams); err != nil {94
t.Fatal(err)95
}96
if teams["@type"] != "MessageCard" || teams["text"] != ev.Summary || teams["summary"] != ev.Summary {97
t.Fatalf("teams %#v", teams)98
}99
100
spec, err = Prepare(PresetMattermost, Input{URL: "https://chat.example/hooks/a", Username: "blue", Icon: "https://example.test/icon.png"})101
if err != nil {102
t.Fatal(err)103
}104
body, err = RenderBody(spec.Body, ev, secrets)105
if err != nil {106
t.Fatal(err)107
}108
var mm map[string]any109
if err := json.Unmarshal(body, &mm); err != nil {110
t.Fatal(err)111
}112
if mm["text"] != ev.Summary || mm["username"] != "blue" || mm["icon_url"] != "https://example.test/icon.png" {113
t.Fatalf("mattermost %#v", mm)114
}115
116
spec, err = Prepare(PresetRocketChat, Input{URL: "https://chat.example/hooks/b"})117
if err != nil {118
t.Fatal(err)119
}120
if strings.Contains(spec.Body, "alias") {121
t.Fatal(spec.Body)122
}123
spec, err = Prepare(PresetRocketChat, Input{URL: "https://chat.example/hooks/b", Alias: `rocket "bot"`})124
if err != nil {125
t.Fatal(err)126
}127
body, err = RenderBody(spec.Body, ev, secrets)128
if err != nil {129
t.Fatal(err)130
}131
var rocket map[string]any132
if err := json.Unmarshal(body, &rocket); err != nil {133
t.Fatal(err)134
}135
if rocket["text"] != ev.Summary || rocket["alias"] != `rocket "bot"` {136
t.Fatalf("rocket %#v", rocket)137
}138
139
spec, err = Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: "42"})140
if err != nil {141
t.Fatal(err)142
}143
if !strings.Contains(spec.URL, "{{secret.BOT_TOKEN}}") {144
t.Fatal(spec.URL)145
}146
url, err := Expand(spec.URL, ev, secrets)147
if err != nil || url != "https://api.telegram.org/botsecret-value/sendMessage" {148
t.Fatalf("telegram url %s %v", url, err)149
}150
body, err = RenderBody(spec.Body, ev, secrets)151
if err != nil {152
t.Fatal(err)153
}154
var tg map[string]any155
if err := json.Unmarshal(body, &tg); err != nil {156
t.Fatal(string(body), err)157
}158
if tg["chat_id"] != "42" || tg["text"] != ev.Summary {159
t.Fatalf("telegram %#v", tg)160
}161
162
spec, err = Prepare(PresetMatrix, Input{163
Homeserver: "https://matrix.example/", Token: "BOT_TOKEN", Room: "!abc:example.org",164
})165
if err != nil {166
t.Fatal(err)167
}168
if spec.Method != "PUT" || !strings.Contains(spec.URL, "/rooms/%21abc%3Aexample.org/send/m.room.message/bluegit-") {169
t.Fatalf("matrix %s %s", spec.Method, spec.URL)170
}171
if spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {172
t.Fatal(spec.Headers)173
}174
headers, err = RenderHeaders(PresetMatrix, spec.Headers, ev, secrets)175
if err != nil || headers["Authorization"] != "Bearer secret-value" {176
t.Fatalf("matrix auth %v %v", headers, err)177
}178
expanded, err := Expand(spec.URL, ev, secrets)179
if err != nil || !strings.Contains(expanded, "/bluegit-push-abc--") {180
t.Fatalf("matrix txn %s %v", expanded, err)181
}182
body, err = RenderBody(spec.Body, ev, secrets)183
if err != nil {184
t.Fatal(err)185
}186
var mx map[string]any187
if err := json.Unmarshal(body, &mx); err != nil {188
t.Fatal(err)189
}190
if mx["msgtype"] != "m.text" || mx["body"] != ev.Summary {191
t.Fatalf("matrix %#v", mx)192
}193
194
spec, err = Prepare(PresetNtfy, Input{Topic: "builds"})195
if err != nil {196
t.Fatal(err)197
}198
if spec.URL != "https://ntfy.sh/builds" || spec.Headers["Content-Type"] != "text/plain" || spec.Headers["Authorization"] != "" {199
t.Fatalf("ntfy default %#v %s", spec.Headers, spec.URL)200
}201
body, err = RenderBody(spec.Body, ev, secrets)202
if err != nil || string(body) != ev.Summary {203
t.Fatalf("ntfy body %q %v", body, err)204
}205
headers, err = RenderHeaders(PresetNtfy, spec.Headers, ev, secrets)206
if err != nil || headers["Content-Type"] != "text/plain" {207
t.Fatalf("ntfy content-type verliest van de json-preset: %v %v", headers, err)208
}209
spec, err = Prepare(PresetNtfy, Input{Server: "https://ntfy.example", Topic: "/alerts/", Token: "NTFY"})210
if err != nil {211
t.Fatal(err)212
}213
if spec.URL != "https://ntfy.example/alerts" || spec.Headers["Authorization"] != "Bearer {{secret.NTFY}}" {214
t.Fatalf("ntfy %#v %s", spec.Headers, spec.URL)215
}216
217
spec, err = Prepare(PresetGotify, Input{Server: "https://gotify.example/", Token: "BOT_TOKEN"})218
if err != nil {219
t.Fatal(err)220
}221
if spec.URL != "https://gotify.example/message" || spec.Headers["X-Gotify-Key"] != "{{secret.BOT_TOKEN}}" {222
t.Fatalf("gotify %#v %s", spec.Headers, spec.URL)223
}224
headers, err = RenderHeaders(PresetGotify, spec.Headers, ev, secrets)225
if err != nil || headers["X-Gotify-Key"] != "secret-value" {226
t.Fatalf("gotify key %v %v", headers, err)227
}228
body, err = RenderBody(spec.Body, ev, secrets)229
if err != nil {230
t.Fatal(err)231
}232
var gotify map[string]any233
if err := json.Unmarshal(body, &gotify); err != nil {234
t.Fatal(err)235
}236
if gotify["title"] != ev.Project || gotify["message"] != ev.Summary {237
t.Fatalf("gotify %#v", gotify)238
}239
240
spec, err = Prepare(PresetGrok, Input{URL: "https://api.example/grok", Token: "BOT_TOKEN"})241
if err != nil {242
t.Fatal(err)243
}244
if spec.Body != "" || spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {245
t.Fatalf("grok %#v %q", spec.Headers, spec.Body)246
}247
headers, err = RenderHeaders(PresetGrok, spec.Headers, ev, secrets)248
if err != nil || headers["Authorization"] != "Bearer secret-value" {249
t.Fatalf("gekozen grok-geheim %v %v", headers, err)250
}251
body, err = RenderBody(spec.Body, ev, secrets)252
if err != nil {253
t.Fatal(err)254
}255
var grok map[string]string256
if err := json.Unmarshal(body, &grok); err != nil || grok["project"] != ev.Project || strings.Contains(string(body), "secret-value") {257
t.Fatalf("grok body %s %v", body, err)258
}259
legacy, err := RenderHeaders(PresetGrok, nil, ev, secrets)260
if err != nil || legacy["Authorization"] != "Bearer grok-secret" {261
t.Fatalf("oude grok-hook houdt GROK_TOKEN: %v %v", legacy, err)262
}263
264
spec, err = Prepare(PresetGeneric, Input{URL: "https://example.test/hook"})265
if err != nil {266
t.Fatal(err)267
}268
if spec.Body != "" || spec.Method != "POST" || spec.Headers["Content-Type"] != "application/json" {269
t.Fatalf("generic %#v", spec)270
}271
body, err = RenderBody(spec.Body, ev, secrets)272
if err != nil {273
t.Fatal(err)274
}275
var generic map[string]string276
if err := json.Unmarshal(body, &generic); err != nil || generic["summary"] != ev.Summary || generic["type"] != EventPush {277
t.Fatalf("generic %s %v", body, err)278
}279
oldDiscord, err := RenderBody("", ev, secrets)280
if err != nil {281
t.Fatal(err)282
}283
if string(oldDiscord) != string(body) {284
t.Fatalf("lege body blijft de gebeurtenis: %s", oldDiscord)285
}286
287
spec, err = Prepare(PresetCustom, Input{288
URL: "https://example.test/hook", Method: "put", ContentType: "text/plain",289
Headers: "Authorization: Bearer {{secret.BOT_TOKEN}}\n",290
Body: "hello {{event.summary}}",291
})292
if err != nil {293
t.Fatal(err)294
}295
if spec.Method != "PUT" || spec.Headers["Content-Type"] != "text/plain" || spec.Headers["Authorization"] != "Bearer {{secret.BOT_TOKEN}}" {296
t.Fatalf("custom %#v %s", spec.Headers, spec.Method)297
}298
headers, err = RenderHeaders(PresetCustom, spec.Headers, ev, secrets)299
if err != nil || headers["Authorization"] != "Bearer secret-value" || headers["Content-Type"] != "text/plain" {300
t.Fatalf("custom headers %v %v", headers, err)301
}302
body, err = RenderBody(spec.Body, ev, secrets)303
if err != nil || string(body) != "hello "+ev.Summary {304
t.Fatalf("custom body %q %v", body, err)305
}306
empty, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook"})307
if err != nil || empty.Method != "POST" || empty.Body != "" || empty.Headers["Content-Type"] != "application/json" {308
t.Fatalf("custom leeg %#v %v", empty, err)309
}310
}311
312
func TestPresetRejects(t *testing.T) {313
if _, err := Prepare("nope", Input{}); err == nil {314
t.Fatal("onbekende preset")315
}316
if _, err := Prepare(PresetTelegram, Input{Token: "lower", Chat: "1"}); err == nil {317
t.Fatal("geheime naam")318
}319
if _, err := Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: ""}); err == nil {320
t.Fatal("lege chat")321
}322
if _, err := Prepare(PresetNtfy, Input{Topic: ""}); err == nil {323
t.Fatal("leeg topic")324
}325
if _, err := Prepare(PresetNtfy, Input{Topic: "a b"}); err == nil {326
t.Fatal("topic met spatie")327
}328
if _, err := Prepare(PresetMatrix, Input{Homeserver: "https://matrix.example", Token: "BOT_TOKEN", Room: "room id"}); err == nil {329
t.Fatal("kamer met spatie")330
}331
if _, err := Prepare(PresetGotify, Input{Token: "BOT_TOKEN"}); err == nil {332
t.Fatal("gotify zonder server")333
}334
if _, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook", Method: "DELETE"}); err == nil {335
t.Fatal("methode")336
}337
if _, err := Prepare(PresetCustom, Input{URL: "https://user:pass@example.test/hook"}); err == nil {338
t.Fatal("userinfo")339
}340
if _, err := Prepare(PresetCustom, Input{URL: "https://example.test/hook", Headers: "Authorization Bearer x"}); err == nil {341
t.Fatal("header zonder dubbele punt")342
}343
if !KnownPreset(PresetCustom) || !KnownPreset(PresetGeneric) || KnownPreset("") {344
t.Fatal("KnownPreset")345
}346
}@@ -0,0 +1,341 @@
1
package webhook
2
3
import (
4
"encoding/json"
5
"net/url"
6
"strings"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/i18n"
10
)
11
12
// Extra presets. generic, discord en grok bestonden al.
13
const (
14
PresetCustom = "custom"
15
PresetSlack = "slack"
16
PresetTeams = "teams"
17
PresetMattermost = "mattermost"
18
PresetRocketChat = "rocketchat"
19
PresetTelegram = "telegram"
20
PresetMatrix = "matrix"
21
PresetGoogleChat = "googlechat"
22
PresetNtfy = "ntfy"
23
PresetGotify = "gotify"
24
)
25
26
// PresetIDs is de volgorde in het formulier.
27
func PresetIDs() []string {
28
return []string{
29
PresetCustom, PresetGeneric, PresetDiscord, PresetSlack, PresetTeams,
30
PresetMattermost, PresetRocketChat, PresetTelegram, PresetMatrix,
31
PresetGoogleChat, PresetNtfy, PresetGotify, PresetGrok,
32
}
33
}
34
35
// KnownPreset meldt of id een ondersteunde preset is.
36
func KnownPreset(id string) bool {
37
for _, p := range PresetIDs() {
38
if p == id {
39
return true
40
}
41
}
42
return false
43
}
44
45
// Input zijn de velden van het formulier. Prepare leest alleen wat bij de preset hoort.
46
type Input struct {
47
URL, Username, Avatar, Icon, Alias string
48
Token, Chat, Server, Topic string
49
Homeserver, Room string
50
Method, ContentType, Headers, Body string
51
}
52
53
// Spec is wat er opgeslagen wordt. De body is een sjabloon; JSON-presets
54
// gebruiken {{event.summary_json}} zodat aanhalingstekens heel blijven.
55
type Spec struct {
56
Method string
57
URL string
58
Headers map[string]string
59
Body string
60
}
61
62
// Prepare bouwt URL, methode, headers en body voor een preset.
63
func Prepare(preset string, in Input) (Spec, error) {
64
if !KnownPreset(preset) {
65
return Spec{}, i18n.E("err.preset")
66
}
67
switch preset {
68
case PresetCustom:
69
return prepareCustom(in)
70
case PresetGeneric:
71
return prepareJSONURL(in.URL)
72
case PresetDiscord:
73
return prepareMessage(in.URL, discordBody(in.Username, in.Avatar))
74
case PresetSlack, PresetGoogleChat:
75
return prepareMessage(in.URL, `{"text":{{event.summary_json}}}`)
76
case PresetTeams:
77
return prepareMessage(in.URL, `{"@type":"MessageCard","@context":"https://schema.org/extensions","summary":{{event.summary_json}},"text":{{event.summary_json}}}`)
78
case PresetMattermost:
79
return prepareMessage(in.URL, mattermostBody(in.Username, in.Icon))
80
case PresetRocketChat:
81
return prepareMessage(in.URL, rocketBody(in.Alias))
82
case PresetTelegram:
83
return prepareTelegram(in)
84
case PresetMatrix:
85
return prepareMatrix(in)
86
case PresetNtfy:
87
return prepareNtfy(in)
88
case PresetGotify:
89
return prepareGotify(in)
90
case PresetGrok:
91
return prepareGrok(in)
92
default:
93
return Spec{}, i18n.E("err.preset")
94
}
95
}
96
97
func prepareJSONURL(raw string) (Spec, error) {
98
u, err := plainURL(raw)
99
if err != nil {
100
return Spec{}, err
101
}
102
return Spec{
103
Method: "POST",
104
URL: u,
105
Headers: map[string]string{"Content-Type": "application/json"},
106
}, nil
107
}
108
109
func prepareMessage(raw, body string) (Spec, error) {
110
spec, err := prepareJSONURL(raw)
111
if err != nil {
112
return Spec{}, err
113
}
114
spec.Body = body
115
return spec, nil
116
}
117
118
func discordBody(username, avatar string) string {
119
b := strings.Builder{}
120
b.WriteString(`{"content":{{event.summary_json}}`)
121
if username != "" {
122
b.WriteString(`,"username":`)
123
b.Write(mustJSON(username))
124
}
125
if avatar != "" {
126
b.WriteString(`,"avatar_url":`)
127
b.Write(mustJSON(avatar))
128
}
129
b.WriteByte('}')
130
return b.String()
131
}
132
133
func mattermostBody(username, icon string) string {
134
b := strings.Builder{}
135
b.WriteString(`{"text":{{event.summary_json}}`)
136
if username != "" {
137
b.WriteString(`,"username":`)
138
b.Write(mustJSON(username))
139
}
140
if icon != "" {
141
b.WriteString(`,"icon_url":`)
142
b.Write(mustJSON(icon))
143
}
144
b.WriteByte('}')
145
return b.String()
146
}
147
148
func rocketBody(alias string) string {
149
if alias == "" {
150
return `{"text":{{event.summary_json}}}`
151
}
152
return `{"text":{{event.summary_json}},"alias":` + string(mustJSON(alias)) + `}`
153
}
154
155
func prepareTelegram(in Input) (Spec, error) {
156
ref, err := secretRef(in.Token)
157
if err != nil {
158
return Spec{}, err
159
}
160
chat := strings.TrimSpace(in.Chat)
161
if chat == "" || strings.ContainsAny(chat, "\r\n") {
162
return Spec{}, i18n.E("err.whChat")
163
}
164
return Spec{
165
Method: "POST",
166
URL: "https://api.telegram.org/bot" + ref + "/sendMessage",
167
Headers: map[string]string{"Content-Type": "application/json"},
168
Body: `{"chat_id":` + string(mustJSON(chat)) + `,"text":{{event.summary_json}}}`,
169
}, nil
170
}
171
172
func prepareMatrix(in Input) (Spec, error) {
173
home, err := plainURL(in.Homeserver)
174
if err != nil {
175
return Spec{}, err
176
}
177
room := strings.TrimSpace(in.Room)
178
if room == "" || strings.ContainsAny(room, " \r\n") {
179
return Spec{}, i18n.E("err.whRoom")
180
}
181
ref, err := secretRef(in.Token)
182
if err != nil {
183
return Spec{}, err
184
}
185
home = strings.TrimRight(home, "/")
186
txn := "bluegit-{{event.type}}-{{event.commit}}-{{event.pipeline_id}}-{{event.release_tag}}"
187
return Spec{
188
Method: "PUT",
189
URL: home + "/_matrix/client/v3/rooms/" + url.QueryEscape(room) + "/send/m.room.message/" + txn,
190
Headers: map[string]string{
191
"Content-Type": "application/json",
192
"Authorization": "Bearer " + ref,
193
},
194
Body: `{"msgtype":"m.text","body":{{event.summary_json}}}`,
195
}, nil
196
}
197
198
func prepareNtfy(in Input) (Spec, error) {
199
server := strings.TrimSpace(in.Server)
200
if server == "" {
201
server = "https://ntfy.sh"
202
}
203
server, err := plainURL(server)
204
if err != nil {
205
return Spec{}, err
206
}
207
topic := strings.Trim(strings.TrimSpace(in.Topic), "/")
208
if topic == "" || strings.ContainsAny(topic, " \r\n?#") {
209
return Spec{}, i18n.E("err.whTopic")
210
}
211
headers := map[string]string{"Content-Type": "text/plain"}
212
if strings.TrimSpace(in.Token) != "" {
213
ref, err := secretRef(in.Token)
214
if err != nil {
215
return Spec{}, err
216
}
217
headers["Authorization"] = "Bearer " + ref
218
}
219
return Spec{
220
Method: "POST",
221
URL: strings.TrimRight(server, "/") + "/" + topic,
222
Headers: headers,
223
Body: "{{event.summary}}",
224
}, nil
225
}
226
227
func prepareGotify(in Input) (Spec, error) {
228
if strings.TrimSpace(in.Server) == "" {
229
return Spec{}, i18n.E("err.whServer")
230
}
231
server, err := plainURL(in.Server)
232
if err != nil {
233
return Spec{}, err
234
}
235
ref, err := secretRef(in.Token)
236
if err != nil {
237
return Spec{}, err
238
}
239
return Spec{
240
Method: "POST",
241
URL: strings.TrimRight(server, "/") + "/message",
242
Headers: map[string]string{
243
"Content-Type": "application/json",
244
"X-Gotify-Key": ref,
245
},
246
Body: `{"title":{{event.project_json}},"message":{{event.summary_json}}}`,
247
}, nil
248
}
249
250
func prepareGrok(in Input) (Spec, error) {
251
spec, err := prepareJSONURL(in.URL)
252
if err != nil {
253
return Spec{}, err
254
}
255
ref, err := secretRef(in.Token)
256
if err != nil {
257
return Spec{}, err
258
}
259
spec.Headers["Authorization"] = "Bearer " + ref
260
return spec, nil
261
}
262
263
func prepareCustom(in Input) (Spec, error) {
264
method := strings.ToUpper(strings.TrimSpace(in.Method))
265
if method == "" {
266
method = "POST"
267
}
268
switch method {
269
case "GET", "POST", "PUT", "PATCH":
270
default:
271
return Spec{}, i18n.E("err.whMethod")
272
}
273
u, err := plainURL(in.URL)
274
if err != nil {
275
return Spec{}, err
276
}
277
ctype := strings.TrimSpace(in.ContentType)
278
if ctype == "" {
279
ctype = "application/json"
280
}
281
if strings.ContainsAny(ctype, "\r\n") {
282
return Spec{}, i18n.E("err.header")
283
}
284
headers := map[string]string{"Content-Type": ctype}
285
extra, err := parseHeaderLines(in.Headers)
286
if err != nil {
287
return Spec{}, err
288
}
289
for k, v := range extra {
290
headers[k] = v
291
}
292
return Spec{Method: method, URL: u, Headers: headers, Body: in.Body}, nil
293
}
294
295
func parseHeaderLines(raw string) (map[string]string, error) {
296
out := map[string]string{}
297
for _, line := range strings.Split(raw, "\n") {
298
line = strings.TrimSpace(line)
299
if line == "" {
300
continue
301
}
302
if strings.ContainsAny(line, "\r") {
303
return nil, i18n.E("err.header")
304
}
305
k, v, ok := strings.Cut(line, ":")
306
k, v = strings.TrimSpace(k), strings.TrimSpace(v)
307
if !ok || k == "" || strings.ContainsAny(k, " \r\n") || strings.ContainsAny(v, "\r\n") {
308
return nil, i18n.E("err.header")
309
}
310
out[k] = v
311
}
312
return out, nil
313
}
314
315
func plainURL(raw string) (string, error) {
316
raw = strings.TrimSpace(raw)
317
if raw == "" {
318
return "", i18n.E("err.whURL")
319
}
320
u, err := url.Parse(raw)
321
if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") || u.User != nil {
322
return "", i18n.E("err.whURL")
323
}
324
return raw, nil
325
}
326
327
func secretRef(name string) (string, error) {
328
name = strings.TrimSpace(name)
329
if err := access.ValidSecretName(name); err != nil {
330
return "", err
331
}
332
return "{{secret." + name + "}}", nil
333
}
334
335
func mustJSON(s string) []byte {
336
b, err := json.Marshal(s)
337
if err != nil {
338
return []byte(`""`)
339
}
340
return b
341
}
@@ -0,0 +1,341 @@1
package webhook2
3
import (4
"encoding/json"5
"net/url"6
"strings"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/i18n"10
)11
12
// Extra presets. generic, discord en grok bestonden al.13
const (14
PresetCustom = "custom"15
PresetSlack = "slack"16
PresetTeams = "teams"17
PresetMattermost = "mattermost"18
PresetRocketChat = "rocketchat"19
PresetTelegram = "telegram"20
PresetMatrix = "matrix"21
PresetGoogleChat = "googlechat"22
PresetNtfy = "ntfy"23
PresetGotify = "gotify"24
)25
26
// PresetIDs is de volgorde in het formulier.27
func PresetIDs() []string {28
return []string{29
PresetCustom, PresetGeneric, PresetDiscord, PresetSlack, PresetTeams,30
PresetMattermost, PresetRocketChat, PresetTelegram, PresetMatrix,31
PresetGoogleChat, PresetNtfy, PresetGotify, PresetGrok,32
}33
}34
35
// KnownPreset meldt of id een ondersteunde preset is.36
func KnownPreset(id string) bool {37
for _, p := range PresetIDs() {38
if p == id {39
return true40
}41
}42
return false43
}44
45
// Input zijn de velden van het formulier. Prepare leest alleen wat bij de preset hoort.46
type Input struct {47
URL, Username, Avatar, Icon, Alias string48
Token, Chat, Server, Topic string49
Homeserver, Room string50
Method, ContentType, Headers, Body string51
}52
53
// Spec is wat er opgeslagen wordt. De body is een sjabloon; JSON-presets54
// gebruiken {{event.summary_json}} zodat aanhalingstekens heel blijven.55
type Spec struct {56
Method string57
URL string58
Headers map[string]string59
Body string60
}61
62
// Prepare bouwt URL, methode, headers en body voor een preset.63
func Prepare(preset string, in Input) (Spec, error) {64
if !KnownPreset(preset) {65
return Spec{}, i18n.E("err.preset")66
}67
switch preset {68
case PresetCustom:69
return prepareCustom(in)70
case PresetGeneric:71
return prepareJSONURL(in.URL)72
case PresetDiscord:73
return prepareMessage(in.URL, discordBody(in.Username, in.Avatar))74
case PresetSlack, PresetGoogleChat:75
return prepareMessage(in.URL, `{"text":{{event.summary_json}}}`)76
case PresetTeams:77
return prepareMessage(in.URL, `{"@type":"MessageCard","@context":"https://schema.org/extensions","summary":{{event.summary_json}},"text":{{event.summary_json}}}`)78
case PresetMattermost:79
return prepareMessage(in.URL, mattermostBody(in.Username, in.Icon))80
case PresetRocketChat:81
return prepareMessage(in.URL, rocketBody(in.Alias))82
case PresetTelegram:83
return prepareTelegram(in)84
case PresetMatrix:85
return prepareMatrix(in)86
case PresetNtfy:87
return prepareNtfy(in)88
case PresetGotify:89
return prepareGotify(in)90
case PresetGrok:91
return prepareGrok(in)92
default:93
return Spec{}, i18n.E("err.preset")94
}95
}96
97
func prepareJSONURL(raw string) (Spec, error) {98
u, err := plainURL(raw)99
if err != nil {100
return Spec{}, err101
}102
return Spec{103
Method: "POST",104
URL: u,105
Headers: map[string]string{"Content-Type": "application/json"},106
}, nil107
}108
109
func prepareMessage(raw, body string) (Spec, error) {110
spec, err := prepareJSONURL(raw)111
if err != nil {112
return Spec{}, err113
}114
spec.Body = body115
return spec, nil116
}117
118
func discordBody(username, avatar string) string {119
b := strings.Builder{}120
b.WriteString(`{"content":{{event.summary_json}}`)121
if username != "" {122
b.WriteString(`,"username":`)123
b.Write(mustJSON(username))124
}125
if avatar != "" {126
b.WriteString(`,"avatar_url":`)127
b.Write(mustJSON(avatar))128
}129
b.WriteByte('}')130
return b.String()131
}132
133
func mattermostBody(username, icon string) string {134
b := strings.Builder{}135
b.WriteString(`{"text":{{event.summary_json}}`)136
if username != "" {137
b.WriteString(`,"username":`)138
b.Write(mustJSON(username))139
}140
if icon != "" {141
b.WriteString(`,"icon_url":`)142
b.Write(mustJSON(icon))143
}144
b.WriteByte('}')145
return b.String()146
}147
148
func rocketBody(alias string) string {149
if alias == "" {150
return `{"text":{{event.summary_json}}}`151
}152
return `{"text":{{event.summary_json}},"alias":` + string(mustJSON(alias)) + `}`153
}154
155
func prepareTelegram(in Input) (Spec, error) {156
ref, err := secretRef(in.Token)157
if err != nil {158
return Spec{}, err159
}160
chat := strings.TrimSpace(in.Chat)161
if chat == "" || strings.ContainsAny(chat, "\r\n") {162
return Spec{}, i18n.E("err.whChat")163
}164
return Spec{165
Method: "POST",166
URL: "https://api.telegram.org/bot" + ref + "/sendMessage",167
Headers: map[string]string{"Content-Type": "application/json"},168
Body: `{"chat_id":` + string(mustJSON(chat)) + `,"text":{{event.summary_json}}}`,169
}, nil170
}171
172
func prepareMatrix(in Input) (Spec, error) {173
home, err := plainURL(in.Homeserver)174
if err != nil {175
return Spec{}, err176
}177
room := strings.TrimSpace(in.Room)178
if room == "" || strings.ContainsAny(room, " \r\n") {179
return Spec{}, i18n.E("err.whRoom")180
}181
ref, err := secretRef(in.Token)182
if err != nil {183
return Spec{}, err184
}185
home = strings.TrimRight(home, "/")186
txn := "bluegit-{{event.type}}-{{event.commit}}-{{event.pipeline_id}}-{{event.release_tag}}"187
return Spec{188
Method: "PUT",189
URL: home + "/_matrix/client/v3/rooms/" + url.QueryEscape(room) + "/send/m.room.message/" + txn,190
Headers: map[string]string{191
"Content-Type": "application/json",192
"Authorization": "Bearer " + ref,193
},194
Body: `{"msgtype":"m.text","body":{{event.summary_json}}}`,195
}, nil196
}197
198
func prepareNtfy(in Input) (Spec, error) {199
server := strings.TrimSpace(in.Server)200
if server == "" {201
server = "https://ntfy.sh"202
}203
server, err := plainURL(server)204
if err != nil {205
return Spec{}, err206
}207
topic := strings.Trim(strings.TrimSpace(in.Topic), "/")208
if topic == "" || strings.ContainsAny(topic, " \r\n?#") {209
return Spec{}, i18n.E("err.whTopic")210
}211
headers := map[string]string{"Content-Type": "text/plain"}212
if strings.TrimSpace(in.Token) != "" {213
ref, err := secretRef(in.Token)214
if err != nil {215
return Spec{}, err216
}217
headers["Authorization"] = "Bearer " + ref218
}219
return Spec{220
Method: "POST",221
URL: strings.TrimRight(server, "/") + "/" + topic,222
Headers: headers,223
Body: "{{event.summary}}",224
}, nil225
}226
227
func prepareGotify(in Input) (Spec, error) {228
if strings.TrimSpace(in.Server) == "" {229
return Spec{}, i18n.E("err.whServer")230
}231
server, err := plainURL(in.Server)232
if err != nil {233
return Spec{}, err234
}235
ref, err := secretRef(in.Token)236
if err != nil {237
return Spec{}, err238
}239
return Spec{240
Method: "POST",241
URL: strings.TrimRight(server, "/") + "/message",242
Headers: map[string]string{243
"Content-Type": "application/json",244
"X-Gotify-Key": ref,245
},246
Body: `{"title":{{event.project_json}},"message":{{event.summary_json}}}`,247
}, nil248
}249
250
func prepareGrok(in Input) (Spec, error) {251
spec, err := prepareJSONURL(in.URL)252
if err != nil {253
return Spec{}, err254
}255
ref, err := secretRef(in.Token)256
if err != nil {257
return Spec{}, err258
}259
spec.Headers["Authorization"] = "Bearer " + ref260
return spec, nil261
}262
263
func prepareCustom(in Input) (Spec, error) {264
method := strings.ToUpper(strings.TrimSpace(in.Method))265
if method == "" {266
method = "POST"267
}268
switch method {269
case "GET", "POST", "PUT", "PATCH":270
default:271
return Spec{}, i18n.E("err.whMethod")272
}273
u, err := plainURL(in.URL)274
if err != nil {275
return Spec{}, err276
}277
ctype := strings.TrimSpace(in.ContentType)278
if ctype == "" {279
ctype = "application/json"280
}281
if strings.ContainsAny(ctype, "\r\n") {282
return Spec{}, i18n.E("err.header")283
}284
headers := map[string]string{"Content-Type": ctype}285
extra, err := parseHeaderLines(in.Headers)286
if err != nil {287
return Spec{}, err288
}289
for k, v := range extra {290
headers[k] = v291
}292
return Spec{Method: method, URL: u, Headers: headers, Body: in.Body}, nil293
}294
295
func parseHeaderLines(raw string) (map[string]string, error) {296
out := map[string]string{}297
for _, line := range strings.Split(raw, "\n") {298
line = strings.TrimSpace(line)299
if line == "" {300
continue301
}302
if strings.ContainsAny(line, "\r") {303
return nil, i18n.E("err.header")304
}305
k, v, ok := strings.Cut(line, ":")306
k, v = strings.TrimSpace(k), strings.TrimSpace(v)307
if !ok || k == "" || strings.ContainsAny(k, " \r\n") || strings.ContainsAny(v, "\r\n") {308
return nil, i18n.E("err.header")309
}310
out[k] = v311
}312
return out, nil313
}314
315
func plainURL(raw string) (string, error) {316
raw = strings.TrimSpace(raw)317
if raw == "" {318
return "", i18n.E("err.whURL")319
}320
u, err := url.Parse(raw)321
if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") || u.User != nil {322
return "", i18n.E("err.whURL")323
}324
return raw, nil325
}326
327
func secretRef(name string) (string, error) {328
name = strings.TrimSpace(name)329
if err := access.ValidSecretName(name); err != nil {330
return "", err331
}332
return "{{secret." + name + "}}", nil333
}334
335
func mustJSON(s string) []byte {336
b, err := json.Marshal(s)337
if err != nil {338
return []byte(`""`)339
}340
return b341
}@@ -150,6 +150,17 @@ func lookup(key string, ev Event, secrets map[string]string) (string, error) {
150
150
}
151
151
152
152
func eventField(ev Event, field string) (string, bool) {
153
if base, ok := strings.CutSuffix(field, "_json"); ok && base != "" {
154
v, ok := eventField(ev, base)
155
if !ok {
156
return "", false
157
}
158
b, err := json.Marshal(v)
159
if err != nil {
160
return "", false
161
}
162
return string(b), true
163
}
153
164
switch field {
154
165
case "type":
155
166
return ev.Type, true
@@ -150,6 +150,17 @@ func lookup(key string, ev Event, secrets map[string]string) (string, error) {150
}150
}151
151
152
func eventField(ev Event, field string) (string, bool) {152
func eventField(ev Event, field string) (string, bool) {153
if base, ok := strings.CutSuffix(field, "_json"); ok && base != "" {154
v, ok := eventField(ev, base)155
if !ok {156
return "", false157
}158
b, err := json.Marshal(v)159
if err != nil {160
return "", false161
}162
return string(b), true163
}153
switch field {164
switch field {154
case "type":165
case "type":155
return ev.Type, true166
return ev.Type, true