forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor Webhook + Add X-Hub-Signature (go-gitea#16176)
This PR removes multiple unneeded fields from the `HookTask` struct and adds the two headers `X-Hub-Signature` and `X-Hub-Signature-256`. ##⚠️ BREAKING⚠️ * The `Secret` field is no longer passed as part of the payload. * "Breaking" change (or fix?): The webhook history shows the real called url and not the url registered in the webhook (`deliver.go`@129). Close go-gitea#16115 Fixes go-gitea#7788 Fixes go-gitea#11755 Co-authored-by: zeripath <[email protected]>
- Loading branch information
1 parent
31fc453
commit c50e175
Showing
18 changed files
with
130 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Copyright 2021 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package migrations | ||
|
|
||
| import ( | ||
| "xorm.io/xorm" | ||
| ) | ||
|
|
||
| func dropWebhookColumns(x *xorm.Engine) error { | ||
| // Make sure the columns exist before dropping them | ||
| type Webhook struct { | ||
| Signature string `xorm:"TEXT"` | ||
| IsSSL bool `xorm:"is_ssl"` | ||
| } | ||
| if err := x.Sync2(new(Webhook)); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| type HookTask struct { | ||
| Typ string `xorm:"VARCHAR(16) index"` | ||
| URL string `xorm:"TEXT"` | ||
| Signature string `xorm:"TEXT"` | ||
| HTTPMethod string `xorm:"http_method"` | ||
| ContentType int | ||
| IsSSL bool | ||
| } | ||
| if err := x.Sync2(new(HookTask)); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sess := x.NewSession() | ||
| defer sess.Close() | ||
| if err := sess.Begin(); err != nil { | ||
| return err | ||
| } | ||
| if err := dropTableColumns(sess, "webhook", "signature", "is_ssl"); err != nil { | ||
| return err | ||
| } | ||
| if err := dropTableColumns(sess, "hook_task", "typ", "url", "signature", "http_method", "content_type", "is_ssl"); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return sess.Commit() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.