From 8a9ae18c9152b568431f0b2364a1f4661dacf8dd Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Thu, 4 Jul 2019 08:27:49 +0100
Subject: [PATCH] fix for gitea push webhook

---
 scm/driver/gitea/webhook.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/scm/driver/gitea/webhook.go b/scm/driver/gitea/webhook.go
index d17552731..a1b7564b0 100644
--- a/scm/driver/gitea/webhook.go
+++ b/scm/driver/gitea/webhook.go
@@ -28,10 +28,13 @@ func (s *webhookService) Parse(req *http.Request, fn scm.SecretFunc) (scm.Webhoo
 		return nil, err
 	}
 
+	secret := ""
 	var hook scm.Webhook
 	switch req.Header.Get("X-Gitea-Event") {
 	case "push":
-		hook, err = s.parsePushHook(data)
+		var push *pushHook
+		hook, push, err = s.parsePushHook(data)
+		secret = push.Secret
 	case "create":
 		hook, err = s.parseCreateHook(data)
 	case "delete":
@@ -49,6 +52,10 @@ func (s *webhookService) Parse(req *http.Request, fn scm.SecretFunc) (scm.Webhoo
 		return nil, err
 	}
 
+	if secret == "" {
+		secret = req.FormValue("secret")
+	}
+
 	// get the gitea signature key to verify the payload
 	// signature. If no key is provided, no validation
 	// is performed.
@@ -59,14 +66,13 @@ func (s *webhookService) Parse(req *http.Request, fn scm.SecretFunc) (scm.Webhoo
 		return hook, nil
 	}
 
-	secret := req.FormValue("secret")
 	signature := req.Header.Get("X-Gitea-Signature")
 
 	// fail if no signature passed
 	if signature == "" && secret == "" {
 		return hook, scm.ErrSignatureInvalid
 	}
-	
+
 	// test signature if header not set and secret is in payload
 	if signature == "" && secret != "" && secret != key {
 		return hook, scm.ErrSignatureInvalid
@@ -80,10 +86,10 @@ func (s *webhookService) Parse(req *http.Request, fn scm.SecretFunc) (scm.Webhoo
 	return hook, nil
 }
 
-func (s *webhookService) parsePushHook(data []byte) (scm.Webhook, error) {
+func (s *webhookService) parsePushHook(data []byte) (scm.Webhook, *pushHook, error) {
 	dst := new(pushHook)
 	err := json.Unmarshal(data, dst)
-	return convertPushHook(dst), err
+	return convertPushHook(dst), dst, err
 }
 
 func (s *webhookService) parseCreateHook(data []byte) (scm.Webhook, error) {
@@ -140,6 +146,7 @@ func (s *webhookService) parsePullRequestHook(data []byte) (scm.Webhook, error)
 type (
 	// gitea push webhook payload
 	pushHook struct {
+		Secret     string     `json:"secret"`
 		Ref        string     `json:"ref"`
 		Before     string     `json:"before"`
 		After      string     `json:"after"`