From 760d61b411460db3f3c688c214a6199b5b18eb27 Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Tue, 5 Oct 2021 12:12:17 -0500 Subject: [PATCH] Add specific event type to header (#17222) * Add specific event type to header Signed-off-by: jolheiser * Change single to type --- services/webhook/deliver.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go index abdbed0d5f..28c3b23b2f 100644 --- a/services/webhook/deliver.go +++ b/services/webhook/deliver.go @@ -113,16 +113,21 @@ func Deliver(t *models.HookTask) error { signatureSHA256 = hex.EncodeToString(sig256.Sum(nil)) } + event := t.EventType.Event() + eventType := string(t.EventType) req.Header.Add("X-Gitea-Delivery", t.UUID) - req.Header.Add("X-Gitea-Event", t.EventType.Event()) + req.Header.Add("X-Gitea-Event", event) + req.Header.Add("X-Gitea-Event-Type", eventType) req.Header.Add("X-Gitea-Signature", signatureSHA256) req.Header.Add("X-Gogs-Delivery", t.UUID) - req.Header.Add("X-Gogs-Event", t.EventType.Event()) + req.Header.Add("X-Gogs-Event", event) + req.Header.Add("X-Gogs-Event-Type", eventType) req.Header.Add("X-Gogs-Signature", signatureSHA256) req.Header.Add("X-Hub-Signature", "sha1="+signatureSHA1) req.Header.Add("X-Hub-Signature-256", "sha256="+signatureSHA256) req.Header["X-GitHub-Delivery"] = []string{t.UUID} - req.Header["X-GitHub-Event"] = []string{t.EventType.Event()} + req.Header["X-GitHub-Event"] = []string{event} + req.Header["X-GitHub-Event-Type"] = []string{eventType} // Record delivery information. t.RequestInfo = &models.HookRequest{