Decouple HookTask from Repository #17940

KN4CK3R · 2021-12-09T17:09:42Z

At the moment a repository reference is needed for webhooks. With the upcoming package PR we need to send webhooks without a repository reference. For example a package is uploaded to an organization. In theory this enables the usage of webhooks for future user actions.

This PR removes the repository id from HookTask and changes how the hooks are processed (see services/webhook/deliver.go). In a follow up PR I want to remove the usage of the `UniqueQueue´ and replace it with a normal queue because there is no reason to be unique.

models/repo.go

models/webhook/hooktask.go

…-user-org-webhook

lunny · 2021-12-18T16:10:12Z

How about to add a new column named type which could be respository or package or user, and the repo_id could be changed to target_id?

…-user-org-webhook

models/repo.go

It should not be a block.

singuliere · 2022-02-22T07:54:59Z

@KN4CK3R could you please resolve the conflict?

models/webhook/hooktask.go

services/webhook/webhook.go

…-user-org-webhook

services/webhook/webhook.go

lunny · 2022-06-03T06:54:11Z

Please resolve the conflicts

6543 · 2022-10-17T22:29:03Z

@KN4CK3R please resolve conflicts

…-user-org-webhook

6543 · 2022-10-19T12:38:01Z

https://github.com/go-gitea/gitea/pull/17940/files#r871602755

…-user-org-webhook

lunny · 2022-10-21T02:29:10Z

Maybe I have posted this concern. When a hook task created from an org/system level webhook, if repo_id is removed from table hook_task, we cannot know which repository the hook_task belongs to easily.

6543 · 2022-10-21T15:33:19Z

@lunny we do store RepoID in Webhook table: https://github.com/go-gitea/gitea/pull/17940/files#diff-8fd01247d233d732c2e8ffc0c554ad22dde28f35fc7e27f5489d5da39f53c79bR184

6543 · 2022-10-21T15:34:15Z

gitea/models/webhook/webhook.go

Line 190 in 716fcfc

    
           RepoID          int64 `xorm:"INDEX"` // An ID of 0 indicates either a default or system webhook

lunny · 2022-10-22T02:02:21Z

@lunny we do store RepoID in Webhook table: https://github.com/go-gitea/gitea/pull/17940/files#diff-8fd01247d233d732c2e8ffc0c554ad22dde28f35fc7e27f5489d5da39f53c79bR184

You don't really understand how webhook and hooktask work. A system/org level webhook's repo_id is always zero.

* upstream/main: adapt README_{Country}.md stype name in localizedExtensions (go-gitea#21486) dump: Add option to skip index dirs (go-gitea#21501) Use recommended vscode configuration in gitpod environments (go-gitea#21537) Expand "Go to File" button again, fix 'Add File' margin (go-gitea#21543) Add yardenshoham to maintainers (go-gitea#21566) Refactor git command arguments and make all arguments to be safe to be used (go-gitea#21535) Update binding to fix bugs (go-gitea#21556) Link mentioned user in markdown only if they are visible to viewer (go-gitea#21554) Require authentication for OAuth token refresh (go-gitea#21421) CSS color enhancements (go-gitea#21534) Allow package version sorting (go-gitea#21453) Add link to user profile in markdown mention only if user exists (go-gitea#21533) Update milestone counters when issue is deleted (go-gitea#21459) Prevent Authorization header for presigned LFS urls (go-gitea#21531) Remove deleted repos from searchresult (go-gitea#21512) Remove unnecessary debug log (go-gitea#21536) Added check for disabled Packages (go-gitea#21540) Decouple HookTask from Repository (go-gitea#17940) Add color previews in markdown (go-gitea#21474) Fix generating compare link (go-gitea#21519)

When re-retrieving hook tasks from the DB double check if they have not been delivered in the meantime. Further ensure that tasks are marked as delivered when they are being delivered. In addition: * Improve the error reporting and make sure that the webhook task population script runs in a separate goroutine. * Only get hook task IDs out of the DB instead of the whole task when repopulating the queue * When repopulating the queue make the DB request paged Ref #17940 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Decouple HookTask from Repository.

94c442a

KN4CK3R added the type/enhancement An improvement of existing functionality label Dec 9, 2021

lunny previously requested changes Dec 10, 2021

View reviewed changes

models/repo.go Show resolved Hide resolved

models/webhook/hooktask.go Show resolved Hide resolved

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 10, 2021

KN4CK3R added 3 commits December 10, 2021 11:50

Remove hook tasks when deleting repo.

09a677c

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

398827b

…-user-org-webhook

Revert removed column and mark as unused.

252d1b2

This was referenced Dec 14, 2021

Delete only HookTasks of the repository #17981

Closed

Email notification for user registration #18013

Open

KN4CK3R added 3 commits January 5, 2022 21:20

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

42f0bbb

…-user-org-webhook

Removed RepoID from ReplayHookTask.

33e6b58

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

e607055

…-user-org-webhook

silverwind approved these changes Feb 17, 2022

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 17, 2022

lunny reviewed Feb 18, 2022

View reviewed changes

models/repo.go Show resolved Hide resolved

singuliere approved these changes Feb 22, 2022

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 22, 2022

lunny added 2 commits February 22, 2022 16:32

Merge branch 'main' into feature-user-org-webhook

98e0aa5

Merge branch 'main' into feature-user-org-webhook

5874c7d

This was referenced Mar 28, 2022

Add Package Registry #16510

Merged

Package Registry related ToDo list #19270

Open

wxiaoguang reviewed Mar 31, 2022

View reviewed changes

models/webhook/hooktask.go Outdated Show resolved Hide resolved

services/webhook/webhook.go Outdated Show resolved Hide resolved

services/webhook/webhook.go Outdated Show resolved Hide resolved

KN4CK3R added 2 commits March 31, 2022 06:17

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

1a26dcb

…-user-org-webhook

Renamed struct.

b05d84f

6543 added this to the 1.17.0 milestone May 3, 2022

6543 added 3 commits May 12, 2022 18:33

Update models/webhook/hooktask.go

cd71a9d

fix

4011cbc

fix lint

fb453ec

6543 reviewed May 12, 2022

View reviewed changes

services/webhook/webhook.go Outdated Show resolved Hide resolved

lunny modified the milestones: 1.17.0, 1.18.0 Jun 16, 2022

KN4CK3R mentioned this pull request Aug 8, 2022

Both Repository and System webhooks not firing on deletion of a repository #20705

Open

GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 17, 2022

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

c576eb9

…-user-org-webhook

silverwind removed the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Oct 19, 2022

KN4CK3R added 2 commits October 20, 2022 16:24

Put individual hook tasks in queue.

f454853

Merge branch 'main' of https://github.com/go-gitea/gitea into feature…

aec14a5

…-user-org-webhook

Merge branch 'main' into feature-user-org-webhook

9f79d44

6543 approved these changes Oct 21, 2022

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 21, 2022

6543 merged commit 1887c95 into go-gitea:main Oct 21, 2022

KN4CK3R deleted the feature-user-org-webhook branch October 22, 2022 11:07

zeripath mentioned this pull request Oct 23, 2022

Ensure that Webhook tasks are not double delivered #21558

Merged

oliverpool mentioned this pull request Oct 24, 2022

Add Webhook authorization header #20926

Merged

go-gitea locked and limited conversation to collaborators May 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Decouple HookTask from Repository #17940

Decouple HookTask from Repository #17940

KN4CK3R commented Dec 9, 2021 •

edited

lunny commented Dec 18, 2021

singuliere commented Feb 22, 2022

lunny commented Jun 3, 2022

6543 commented Oct 17, 2022

6543 commented Oct 19, 2022

lunny commented Oct 21, 2022 •

edited

6543 commented Oct 21, 2022

6543 commented Oct 21, 2022

lunny commented Oct 22, 2022 •

edited

Decouple HookTask from Repository #17940

Decouple HookTask from Repository #17940

Conversation

KN4CK3R commented Dec 9, 2021 • edited

lunny commented Dec 18, 2021

singuliere commented Feb 22, 2022

lunny commented Jun 3, 2022

6543 commented Oct 17, 2022

6543 commented Oct 19, 2022

lunny commented Oct 21, 2022 • edited

6543 commented Oct 21, 2022

6543 commented Oct 21, 2022

lunny commented Oct 22, 2022 • edited

KN4CK3R commented Dec 9, 2021 •

edited

lunny commented Oct 21, 2022 •

edited

lunny commented Oct 22, 2022 •

edited