shanec/forgejo-sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix: Add secret to all webhook's payload where it has been missing (#126)

Browse source 
affects webhooks for:
* Delete
* Fork
* IssueComment
* Release

Resolves: go-gitea/gitea#4732, go-gitea/gitea#5173
Signed-off-by: Berengar W. Lehr <Berengar.Lehr@kompetenztest.de>
This commit is contained in:
Peter Hoffmann 2018-10-27 16:55:26 +02:00 committed by Bo-Yi Wu
parent 2d00f9f4d4
commit 11c860c8e4
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gitea/hook.go
View file

@ -199,7 +199,7 @@ type CreatePayload struct {
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret FIXME // SetSecret modifies the secret of the CreatePayload
func (p *CreatePayload) SetSecret(secret string) { func (p *CreatePayload) SetSecret(secret string) {
p.Secret = secret p.Secret = secret
} }
@ -246,6 +246,7 @@ const (
// DeletePayload represents delete payload // DeletePayload represents delete payload
type DeletePayload struct { type DeletePayload struct {
Secret string `json:"secret"`
Ref string `json:"ref"` Ref string `json:"ref"`
RefType string `json:"ref_type"` RefType string `json:"ref_type"`
PusherType PusherType `json:"pusher_type"` PusherType PusherType `json:"pusher_type"`
@ -253,8 +254,9 @@ type DeletePayload struct {
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret implements Payload // SetSecret modifies the secret of the DeletePayload
func (p *DeletePayload) SetSecret(secret string) { func (p *DeletePayload) SetSecret(secret string) {
p.Secret = secret
} }
// JSONPayload implements Payload // JSONPayload implements Payload
@ -271,13 +273,15 @@ func (p *DeletePayload) JSONPayload() ([]byte, error) {
// ForkPayload represents fork payload // ForkPayload represents fork payload
type ForkPayload struct { type ForkPayload struct {
Secret string `json:"secret"`
Forkee *Repository `json:"forkee"` Forkee *Repository `json:"forkee"`
Repo *Repository `json:"repository"` Repo *Repository `json:"repository"`
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret implements Payload // SetSecret modifies the secret of the ForkPayload
func (p *ForkPayload) SetSecret(secret string) { func (p *ForkPayload) SetSecret(secret string) {
p.Secret = secret
} }
// JSONPayload implements Payload // JSONPayload implements Payload
@ -297,6 +301,7 @@ const (
// IssueCommentPayload represents a payload information of issue comment event. // IssueCommentPayload represents a payload information of issue comment event.
type IssueCommentPayload struct { type IssueCommentPayload struct {
Secret string `json:"secret"`
Action HookIssueCommentAction `json:"action"` Action HookIssueCommentAction `json:"action"`
Issue *Issue `json:"issue"` Issue *Issue `json:"issue"`
Comment *Comment `json:"comment"` Comment *Comment `json:"comment"`
@ -305,8 +310,9 @@ type IssueCommentPayload struct {
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret implements Payload // SetSecret modifies the secret of the IssueCommentPayload
func (p *IssueCommentPayload) SetSecret(secret string) { func (p *IssueCommentPayload) SetSecret(secret string) {
p.Secret = secret
} }
// JSONPayload implements Payload // JSONPayload implements Payload
@ -333,14 +339,16 @@ const (
// ReleasePayload represents a payload information of release event. // ReleasePayload represents a payload information of release event.
type ReleasePayload struct { type ReleasePayload struct {
Secret string `json:"secret"`
Action HookReleaseAction `json:"action"` Action HookReleaseAction `json:"action"`
Release *Release `json:"release"` Release *Release `json:"release"`
Repository *Repository `json:"repository"` Repository *Repository `json:"repository"`
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret implements Payload // SetSecret modifies the secret of the ReleasePayload
func (p *ReleasePayload) SetSecret(secret string) { func (p *ReleasePayload) SetSecret(secret string) {
p.Secret = secret
} }
// JSONPayload implements Payload // JSONPayload implements Payload
@ -368,7 +376,7 @@ type PushPayload struct {
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret FIXME // SetSecret modifies the secret of the PushPayload
func (p *PushPayload) SetSecret(secret string) { func (p *PushPayload) SetSecret(secret string) {
p.Secret = secret p.Secret = secret
} }
@ -520,7 +528,7 @@ type RepositoryPayload struct {
Sender *User `json:"sender"` Sender *User `json:"sender"`
} }
// SetSecret set the payload's secret // SetSecret modifies the secret of the RepositoryPayload
func (p *RepositoryPayload) SetSecret(secret string) { func (p *RepositoryPayload) SetSecret(secret string) {
p.Secret = secret p.Secret = secret
} }